Revved to chromium 0e1d34edba6a5d8f7fe43c5b675880a36f4b3861 refs/remotes/origin/HEAD
filter gyp out of build/landmines.py
filter pepper out of mojo/examples/BUILD.gn
filter html_viewer out of mojo/services/BUILD.gn
filter js out of mojo/BUILD.gn and mojo/tools/data/unittests
filter js/bindings out of mojo/public/BUILD.gn
applied patch gpu_media.patch
applied patch cc_strip_video.patch
applied patch ui_test_support.patch
applied patch remove_ipc_deps.patch
applied patch ui_compositor.patch
applied patch net_sql.patch
diff --git a/mojo/services/clipboard/clipboard_standalone_impl.h b/mojo/services/clipboard/clipboard_standalone_impl.h
index ccb8c54..1a62e7d 100644
--- a/mojo/services/clipboard/clipboard_standalone_impl.h
+++ b/mojo/services/clipboard/clipboard_standalone_impl.h
@@ -25,20 +25,20 @@
static const int kNumClipboards = 3;
ClipboardStandaloneImpl();
- virtual ~ClipboardStandaloneImpl();
+ ~ClipboardStandaloneImpl() override;
// InterfaceImpl<mojo::Clipboard> implementation.
- virtual void GetSequenceNumber(
+ void GetSequenceNumber(
Clipboard::Type clipboard_type,
const mojo::Callback<void(uint64_t)>& callback) override;
- virtual void GetAvailableMimeTypes(
+ void GetAvailableMimeTypes(
Clipboard::Type clipboard_types,
const mojo::Callback<void(mojo::Array<mojo::String>)>& callback) override;
- virtual void ReadMimeType(
+ void ReadMimeType(
Clipboard::Type clipboard_type,
const mojo::String& mime_type,
const mojo::Callback<void(mojo::Array<uint8_t>)>& callback) override;
- virtual void WriteClipboardData(
+ void WriteClipboardData(
Clipboard::Type clipboard_type,
mojo::Map<mojo::String, mojo::Array<uint8_t>> data) override;
diff --git a/mojo/services/clipboard/main.cc b/mojo/services/clipboard/main.cc
index fcc33d1..a7a2664 100644
--- a/mojo/services/clipboard/main.cc
+++ b/mojo/services/clipboard/main.cc
@@ -20,19 +20,18 @@
public mojo::InterfaceFactory<mojo::Clipboard> {
public:
Delegate() {}
- virtual ~Delegate() {}
+ ~Delegate() override {}
// mojo::ApplicationDelegate implementation.
- virtual bool ConfigureIncomingConnection(
+ bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override {
connection->AddService(this);
return true;
}
// mojo::InterfaceFactory<mojo::Clipboard> implementation.
- virtual void Create(
- mojo::ApplicationConnection* connection,
- mojo::InterfaceRequest<mojo::Clipboard> request) override {
+ void Create(mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::Clipboard> request) override {
// TODO(erg): Write native implementations of the clipboard. For now, we
// just build a clipboard which doesn't interact with the system.
mojo::BindToRequest(new mojo::ClipboardStandaloneImpl(), &request);
diff --git a/mojo/services/gles2/command_buffer_impl.cc b/mojo/services/gles2/command_buffer_impl.cc
index d221750..f04acde 100644
--- a/mojo/services/gles2/command_buffer_impl.cc
+++ b/mojo/services/gles2/command_buffer_impl.cc
@@ -28,17 +28,15 @@
public:
MemoryTrackerStub() {}
- virtual void TrackMemoryAllocatedChange(size_t old_size,
- size_t new_size,
- gpu::gles2::MemoryTracker::Pool pool)
- override {}
+ void TrackMemoryAllocatedChange(
+ size_t old_size,
+ size_t new_size,
+ gpu::gles2::MemoryTracker::Pool pool) override {}
- virtual bool EnsureGPUMemoryAvailable(size_t size_needed) override {
- return true;
- };
+ bool EnsureGPUMemoryAvailable(size_t size_needed) override { return true; };
private:
- virtual ~MemoryTrackerStub() {}
+ ~MemoryTrackerStub() override {}
DISALLOW_COPY_AND_ASSIGN(MemoryTrackerStub);
};
diff --git a/mojo/services/gles2/command_buffer_impl.h b/mojo/services/gles2/command_buffer_impl.h
index a304e88..c67effa 100644
--- a/mojo/services/gles2/command_buffer_impl.h
+++ b/mojo/services/gles2/command_buffer_impl.h
@@ -41,19 +41,18 @@
const gfx::Size& size,
gfx::GLShareGroup* share_group,
gpu::gles2::MailboxManager* mailbox_manager);
- virtual ~CommandBufferImpl();
+ ~CommandBufferImpl() override;
- virtual void Initialize(CommandBufferSyncClientPtr sync_client,
- mojo::ScopedSharedBufferHandle shared_state) override;
- virtual void SetGetBuffer(int32_t buffer) override;
- virtual void Flush(int32_t put_offset) override;
- virtual void MakeProgress(int32_t last_get_offset) override;
- virtual void RegisterTransferBuffer(
- int32_t id,
- mojo::ScopedSharedBufferHandle transfer_buffer,
- uint32_t size) override;
- virtual void DestroyTransferBuffer(int32_t id) override;
- virtual void Echo(const Callback<void()>& callback) override;
+ void Initialize(CommandBufferSyncClientPtr sync_client,
+ mojo::ScopedSharedBufferHandle shared_state) override;
+ void SetGetBuffer(int32_t buffer) override;
+ void Flush(int32_t put_offset) override;
+ void MakeProgress(int32_t last_get_offset) override;
+ void RegisterTransferBuffer(int32_t id,
+ mojo::ScopedSharedBufferHandle transfer_buffer,
+ uint32_t size) override;
+ void DestroyTransferBuffer(int32_t id) override;
+ void Echo(const Callback<void()>& callback) override;
private:
bool DoInitialize(mojo::ScopedSharedBufferHandle shared_state);
diff --git a/mojo/services/gles2/mojo_buffer_backing.h b/mojo/services/gles2/mojo_buffer_backing.h
index 9304df7..079e98e 100644
--- a/mojo/services/gles2/mojo_buffer_backing.h
+++ b/mojo/services/gles2/mojo_buffer_backing.h
@@ -18,14 +18,14 @@
MojoBufferBacking(mojo::ScopedSharedBufferHandle handle,
void* memory,
size_t size);
- virtual ~MojoBufferBacking();
+ ~MojoBufferBacking() override;
static scoped_ptr<gpu::BufferBacking> Create(
mojo::ScopedSharedBufferHandle handle,
size_t size);
- virtual void* GetMemory() const override;
- virtual size_t GetSize() const override;
+ void* GetMemory() const override;
+ size_t GetSize() const override;
private:
mojo::ScopedSharedBufferHandle handle_;
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index e2407bd..b43b374 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -86,19 +86,18 @@
blink::WebHistoryCommitType commit_type);
// ViewManagerDelegate methods:
- virtual void OnEmbed(
- ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* embedee_service_provider_impl,
- scoped_ptr<ServiceProvider> embedder_service_provider) override;
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
+ void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* embedee_service_provider_impl,
+ scoped_ptr<ServiceProvider> embedder_service_provider) override;
+ void OnViewManagerDisconnected(ViewManager* view_manager) override;
// ViewObserver methods:
- virtual void OnViewBoundsChanged(View* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override;
- virtual void OnViewDestroyed(View* view) override;
- virtual void OnViewInputEvent(View* view, const EventPtr& event) override;
+ void OnViewBoundsChanged(View* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override;
+ void OnViewDestroyed(View* view) override;
+ void OnViewInputEvent(View* view, const EventPtr& event) override;
void Load(URLResponsePtr response);
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index a26651a..967a75a 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -36,11 +36,11 @@
: shell_(shell),
compositor_thread_(compositor_thread),
web_media_player_factory_(web_media_player_factory) {}
- virtual ~ContentHandlerImpl() {}
+ ~ContentHandlerImpl() override {}
private:
// Overridden from ContentHandler:
- virtual void OnConnect(
+ void OnConnect(
const mojo::String& requestor_url,
URLResponsePtr response,
InterfaceRequest<ServiceProvider> service_provider_request) override {
@@ -63,11 +63,11 @@
public:
HTMLViewer() : compositor_thread_("compositor thread") {}
- virtual ~HTMLViewer() { blink::shutdown(); }
+ ~HTMLViewer() override { blink::shutdown(); }
private:
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* app) override {
+ void Initialize(ApplicationImpl* app) override {
shell_ = app->shell();
blink_platform_impl_.reset(new BlinkPlatformImpl(app));
blink::initialize(blink_platform_impl_.get());
@@ -86,15 +86,14 @@
compositor_thread_.message_loop_proxy()));
}
- virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
- override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
connection->AddService(this);
return true;
}
// Overridden from InterfaceFactory<ContentHandler>
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<ContentHandler> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<ContentHandler> request) override {
BindToRequest(
new ContentHandlerImpl(shell_, compositor_thread_.message_loop_proxy(),
web_media_player_factory_.get()),
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h
index 5221902..a567aaf 100644
--- a/mojo/services/html_viewer/weblayertreeview_impl.h
+++ b/mojo/services/html_viewer/weblayertreeview_impl.h
@@ -45,24 +45,24 @@
void set_view(View* view) { view_ = view; }
// cc::LayerTreeHostClient implementation.
- virtual void WillBeginMainFrame(int frame_id) override;
- virtual void DidBeginMainFrame() override;
- virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override;
- virtual void Layout() override;
- virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
- const gfx::Vector2d& outer_delta,
- float page_scale,
- float top_controls_delta) override;
- virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
- float page_scale,
- float top_controls_delta) override;
- virtual void RequestNewOutputSurface(bool fallback) override;
- virtual void DidInitializeOutputSurface() override;
- virtual void WillCommit() override;
- virtual void DidCommit() override;
- virtual void DidCommitAndDrawFrame() override;
- virtual void DidCompleteSwapBuffers() override;
- virtual void RateLimitSharedMainThreadContext() override {}
+ void WillBeginMainFrame(int frame_id) override;
+ void DidBeginMainFrame() override;
+ void BeginMainFrame(const cc::BeginFrameArgs& args) override;
+ void Layout() override;
+ void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
+ const gfx::Vector2d& outer_delta,
+ float page_scale,
+ float top_controls_delta) override;
+ void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
+ float page_scale,
+ float top_controls_delta) override;
+ void RequestNewOutputSurface(bool fallback) override;
+ void DidInitializeOutputSurface() override;
+ void WillCommit() override;
+ void DidCommit() override;
+ void DidCommitAndDrawFrame() override;
+ void DidCompleteSwapBuffers() override;
+ void RateLimitSharedMainThreadContext() override {}
// blink::WebLayerTreeView implementation.
virtual void setSurfaceReady() override;
@@ -110,7 +110,7 @@
virtual void setShowScrollBottleneckRects(bool) {}
// OutputSurfaceMojoClient implementation.
- virtual void DidCreateSurface(cc::SurfaceId id) override;
+ void DidCreateSurface(cc::SurfaceId id) override;
private:
void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
diff --git a/mojo/services/html_viewer/websockethandle_impl.cc b/mojo/services/html_viewer/websockethandle_impl.cc
index c7f55e3..027b89e 100644
--- a/mojo/services/html_viewer/websockethandle_impl.cc
+++ b/mojo/services/html_viewer/websockethandle_impl.cc
@@ -68,15 +68,14 @@
explicit WebSocketClientImpl(WebSocketHandleImpl* handle,
blink::WebSocketHandleClient* client)
: handle_(handle), client_(client) {}
- virtual ~WebSocketClientImpl() {}
+ ~WebSocketClientImpl() override {}
private:
// WebSocketClient methods:
- virtual void DidConnect(bool fail,
- const String& selected_subprotocol,
- const String& extensions,
- ScopedDataPipeConsumerHandle receive_stream)
- override {
+ void DidConnect(bool fail,
+ const String& selected_subprotocol,
+ const String& extensions,
+ ScopedDataPipeConsumerHandle receive_stream) override {
blink::WebSocketHandleClient* client = client_;
WebSocketHandleImpl* handle = handle_;
receive_stream_ = receive_stream.Pass();
@@ -90,21 +89,21 @@
// |handle| can be deleted here.
}
- virtual void DidReceiveData(bool fin,
- WebSocket::MessageType type,
- uint32_t num_bytes) override {
+ void DidReceiveData(bool fin,
+ WebSocket::MessageType type,
+ uint32_t num_bytes) override {
read_queue_->Read(num_bytes,
base::Bind(&WebSocketClientImpl::DidReadFromReceiveStream,
base::Unretained(this),
fin, type, num_bytes));
}
- virtual void DidReceiveFlowControl(int64_t quota) override {
+ void DidReceiveFlowControl(int64_t quota) override {
client_->didReceiveFlowControl(handle_, quota);
// |handle| can be deleted here.
}
- virtual void DidFail(const String& message) override {
+ void DidFail(const String& message) override {
blink::WebSocketHandleClient* client = client_;
WebSocketHandleImpl* handle = handle_;
handle->Disconnect(); // deletes |this|
@@ -112,9 +111,7 @@
// |handle| can be deleted here.
}
- virtual void DidClose(bool was_clean,
- uint16_t code,
- const String& reason) override {
+ void DidClose(bool was_clean, uint16_t code, const String& reason) override {
blink::WebSocketHandleClient* client = client_;
WebSocketHandleImpl* handle = handle_;
handle->Disconnect(); // deletes |this|
diff --git a/mojo/services/html_viewer/webthread_impl.cc b/mojo/services/html_viewer/webthread_impl.cc
index 678d22e..8c2425a 100644
--- a/mojo/services/html_viewer/webthread_impl.cc
+++ b/mojo/services/html_viewer/webthread_impl.cc
@@ -24,11 +24,11 @@
TaskObserverAdapter(WebThread::TaskObserver* observer)
: observer_(observer) {}
- virtual void WillProcessTask(const base::PendingTask& pending_task) override {
+ void WillProcessTask(const base::PendingTask& pending_task) override {
observer_->willProcessTask();
}
- virtual void DidProcessTask(const base::PendingTask& pending_task) override {
+ void DidProcessTask(const base::PendingTask& pending_task) override {
observer_->didProcessTask();
}
diff --git a/mojo/services/native_viewport/gpu_impl.h b/mojo/services/native_viewport/gpu_impl.h
index 4aeb53b..6b996c7 100644
--- a/mojo/services/native_viewport/gpu_impl.h
+++ b/mojo/services/native_viewport/gpu_impl.h
@@ -27,14 +27,14 @@
GpuImpl(const scoped_refptr<gfx::GLShareGroup>& share_group,
const scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager);
- virtual ~GpuImpl();
+ ~GpuImpl() override;
- virtual void CreateOnscreenGLES2Context(
+ void CreateOnscreenGLES2Context(
uint64_t native_viewport_id,
SizePtr size,
InterfaceRequest<CommandBuffer> command_buffer_request) override;
- virtual void CreateOffscreenGLES2Context(
+ void CreateOffscreenGLES2Context(
InterfaceRequest<CommandBuffer> command_buffer_request) override;
private:
diff --git a/mojo/services/native_viewport/main.cc b/mojo/services/native_viewport/main.cc
index 3271cc4..1cd936f 100644
--- a/mojo/services/native_viewport/main.cc
+++ b/mojo/services/native_viewport/main.cc
@@ -28,7 +28,7 @@
: share_group_(new gfx::GLShareGroup),
mailbox_manager_(new gpu::gles2::MailboxManager),
is_headless_(false) {}
- virtual ~NativeViewportAppDelegate() {}
+ ~NativeViewportAppDelegate() override {}
private:
bool HasArg(const std::string& arg) {
@@ -37,7 +37,7 @@
}
// ApplicationDelegate implementation.
- virtual void Initialize(ApplicationImpl* application) override {
+ void Initialize(ApplicationImpl* application) override {
app_ = application;
#if !defined(COMPONENT_BUILD)
@@ -49,7 +49,7 @@
is_headless_ = HasArg(kUseHeadlessConfig);
}
- virtual bool ConfigureIncomingConnection(
+ bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override {
connection->AddService<NativeViewport>(this);
connection->AddService<Gpu>(this);
@@ -57,14 +57,14 @@
}
// InterfaceFactory<NativeViewport> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<NativeViewport> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<NativeViewport> request) override {
BindToRequest(new NativeViewportImpl(app_, is_headless_), &request);
}
// InterfaceFactory<Gpu> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<Gpu> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<Gpu> request) override {
BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()),
&request);
}
diff --git a/mojo/services/native_viewport/native_viewport_impl.h b/mojo/services/native_viewport/native_viewport_impl.h
index 03918cb..d63b0f7 100644
--- a/mojo/services/native_viewport/native_viewport_impl.h
+++ b/mojo/services/native_viewport/native_viewport_impl.h
@@ -26,23 +26,21 @@
public PlatformViewport::Delegate {
public:
NativeViewportImpl(ApplicationImpl* app, bool is_headless);
- virtual ~NativeViewportImpl();
+ ~NativeViewportImpl() override;
// InterfaceImpl<NativeViewport> implementation.
- virtual void Create(SizePtr size,
- const Callback<void(uint64_t)>& callback) override;
- virtual void Show() override;
- virtual void Hide() override;
- virtual void Close() override;
- virtual void SetSize(SizePtr size) override;
- virtual void SubmittedFrame(SurfaceIdPtr surface_id) override;
+ void Create(SizePtr size, const Callback<void(uint64_t)>& callback) override;
+ void Show() override;
+ void Hide() override;
+ void Close() override;
+ void SetSize(SizePtr size) override;
+ void SubmittedFrame(SurfaceIdPtr surface_id) override;
// PlatformViewport::Delegate implementation.
- virtual void OnBoundsChanged(const gfx::Rect& bounds) override;
- virtual void OnAcceleratedWidgetAvailable(
- gfx::AcceleratedWidget widget) override;
- virtual bool OnEvent(ui::Event* ui_event) override;
- virtual void OnDestroyed() override;
+ void OnBoundsChanged(const gfx::Rect& bounds) override;
+ void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override;
+ bool OnEvent(ui::Event* ui_event) override;
+ void OnDestroyed() override;
void AckEvent();
diff --git a/mojo/services/native_viewport/platform_viewport_headless.h b/mojo/services/native_viewport/platform_viewport_headless.h
index 9b9743f..ba2a5b1 100644
--- a/mojo/services/native_viewport/platform_viewport_headless.h
+++ b/mojo/services/native_viewport/platform_viewport_headless.h
@@ -10,7 +10,7 @@
class PlatformViewportHeadless : public PlatformViewport {
public:
- virtual ~PlatformViewportHeadless();
+ ~PlatformViewportHeadless() override;
static scoped_ptr<PlatformViewport> Create(Delegate* delegate);
@@ -18,14 +18,14 @@
explicit PlatformViewportHeadless(Delegate* delegate);
// Overridden from PlatformViewport:
- virtual void Init(const gfx::Rect& bounds) override;
- virtual void Show() override;
- virtual void Hide() override;
- virtual void Close() override;
- virtual gfx::Size GetSize() override;
- virtual void SetBounds(const gfx::Rect& bounds) override;
- virtual void SetCapture() override;
- virtual void ReleaseCapture() override;
+ void Init(const gfx::Rect& bounds) override;
+ void Show() override;
+ void Hide() override;
+ void Close() override;
+ gfx::Size GetSize() override;
+ void SetBounds(const gfx::Rect& bounds) override;
+ void SetCapture() override;
+ void ReleaseCapture() override;
Delegate* delegate_;
gfx::Rect bounds_;
diff --git a/mojo/services/native_viewport/platform_viewport_mac.mm b/mojo/services/native_viewport/platform_viewport_mac.mm
index 40bee95..a74b6ba 100644
--- a/mojo/services/native_viewport/platform_viewport_mac.mm
+++ b/mojo/services/native_viewport/platform_viewport_mac.mm
@@ -20,14 +20,14 @@
window_(nil) {
}
- virtual ~PlatformViewportMac() {
+ ~PlatformViewportMac() override {
[window_ orderOut:nil];
[window_ close];
}
private:
// Overridden from PlatformViewport:
- virtual void Init(const gfx::Rect& bounds) override {
+ void Init(const gfx::Rect& bounds) override {
[NSApplication sharedApplication];
rect_ = bounds;
@@ -40,34 +40,22 @@
delegate_->OnBoundsChanged(rect_);
}
- virtual void Show() override {
- [window_ orderFront:nil];
- }
+ void Show() override { [window_ orderFront:nil]; }
- virtual void Hide() override {
- [window_ orderOut:nil];
- }
+ void Hide() override { [window_ orderOut:nil]; }
- virtual void Close() override {
+ void Close() override {
// TODO(beng): perform this in response to NSWindow destruction.
delegate_->OnDestroyed();
}
- virtual gfx::Size GetSize() override {
- return rect_.size();
- }
+ gfx::Size GetSize() override { return rect_.size(); }
- virtual void SetBounds(const gfx::Rect& bounds) override {
- NOTIMPLEMENTED();
- }
+ void SetBounds(const gfx::Rect& bounds) override { NOTIMPLEMENTED(); }
- virtual void SetCapture() override {
- NOTIMPLEMENTED();
- }
+ void SetCapture() override { NOTIMPLEMENTED(); }
- virtual void ReleaseCapture() override {
- NOTIMPLEMENTED();
- }
+ void ReleaseCapture() override { NOTIMPLEMENTED(); }
Delegate* delegate_;
NSWindow* window_;
diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc
index b34928e..099b31c 100644
--- a/mojo/services/native_viewport/platform_viewport_x11.cc
+++ b/mojo/services/native_viewport/platform_viewport_x11.cc
@@ -24,14 +24,14 @@
explicit PlatformViewportX11(Delegate* delegate) : delegate_(delegate) {
}
- virtual ~PlatformViewportX11() {
+ ~PlatformViewportX11() override {
// Destroy the platform-window while |this| is still alive.
platform_window_.reset();
}
private:
// Overridden from PlatformViewport:
- virtual void Init(const gfx::Rect& bounds) override {
+ void Init(const gfx::Rect& bounds) override {
CHECK(!event_source_);
CHECK(!platform_window_);
@@ -41,44 +41,31 @@
platform_window_->SetBounds(bounds);
}
- virtual void Show() override {
- platform_window_->Show();
- }
+ void Show() override { platform_window_->Show(); }
- virtual void Hide() override {
- platform_window_->Hide();
- }
+ void Hide() override { platform_window_->Hide(); }
- virtual void Close() override {
- platform_window_->Close();
- }
+ void Close() override { platform_window_->Close(); }
- virtual gfx::Size GetSize() override {
- return bounds_.size();
- }
+ gfx::Size GetSize() override { return bounds_.size(); }
- virtual void SetBounds(const gfx::Rect& bounds) override {
+ void SetBounds(const gfx::Rect& bounds) override {
platform_window_->SetBounds(bounds);
}
- virtual void SetCapture() override {
- platform_window_->SetCapture();
- }
+ void SetCapture() override { platform_window_->SetCapture(); }
- virtual void ReleaseCapture() override {
- platform_window_->ReleaseCapture();
- }
+ void ReleaseCapture() override { platform_window_->ReleaseCapture(); }
// ui::PlatformWindowDelegate:
- virtual void OnBoundsChanged(const gfx::Rect& new_bounds) override {
+ void OnBoundsChanged(const gfx::Rect& new_bounds) override {
bounds_ = new_bounds;
delegate_->OnBoundsChanged(new_bounds);
}
- virtual void OnDamageRect(const gfx::Rect& damaged_region) override {
- }
+ void OnDamageRect(const gfx::Rect& damaged_region) override {}
- virtual void DispatchEvent(ui::Event* event) override {
+ void DispatchEvent(ui::Event* event) override {
delegate_->OnEvent(event);
// We want to emulate the WM_CHAR generation behaviour of Windows.
@@ -113,26 +100,19 @@
}
}
- virtual void OnCloseRequest() override {
- platform_window_->Close();
- }
+ void OnCloseRequest() override { platform_window_->Close(); }
- virtual void OnClosed() override {
- delegate_->OnDestroyed();
- }
+ void OnClosed() override { delegate_->OnDestroyed(); }
- virtual void OnWindowStateChanged(ui::PlatformWindowState state) override {
- }
+ void OnWindowStateChanged(ui::PlatformWindowState state) override {}
- virtual void OnLostCapture() override {
- }
+ void OnLostCapture() override {}
- virtual void OnAcceleratedWidgetAvailable(
- gfx::AcceleratedWidget widget) override {
+ void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override {
delegate_->OnAcceleratedWidgetAvailable(widget);
}
- virtual void OnActivationChanged(bool active) override {}
+ void OnActivationChanged(bool active) override {}
scoped_ptr<ui::PlatformEventSource> event_source_;
scoped_ptr<ui::PlatformWindow> platform_window_;
diff --git a/mojo/services/native_viewport/viewport_surface.h b/mojo/services/native_viewport/viewport_surface.h
index 3e5ec59..9fc4260 100644
--- a/mojo/services/native_viewport/viewport_surface.h
+++ b/mojo/services/native_viewport/viewport_surface.h
@@ -27,7 +27,7 @@
Gpu* gpu_service,
const gfx::Size& size,
cc::SurfaceId child_id);
- virtual ~ViewportSurface();
+ ~ViewportSurface() override;
void SetWidgetId(uint64_t widget_id);
void SetSize(const gfx::Size& size);
@@ -39,7 +39,7 @@
void SubmitFrame();
// SurfaceClient implementation.
- virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override;
+ void ReturnResources(Array<ReturnedResourcePtr> resources) override;
SurfacePtr surface_;
Gpu* gpu_service_;
diff --git a/mojo/services/network/cookie_store_impl.h b/mojo/services/network/cookie_store_impl.h
index 9ec5571..5bb4d2d 100644
--- a/mojo/services/network/cookie_store_impl.h
+++ b/mojo/services/network/cookie_store_impl.h
@@ -14,14 +14,14 @@
class CookieStoreImpl : public InterfaceImpl<CookieStore> {
public:
CookieStoreImpl(NetworkContext* context, const GURL& origin);
- virtual ~CookieStoreImpl();
+ ~CookieStoreImpl() override;
private:
// CookieStore methods:
- virtual void Get(const String& url,
- const Callback<void(String)>& callback) override;
- virtual void Set(const String& url, const String& cookie,
- const Callback<void(bool)>& callback) override;
+ void Get(const String& url, const Callback<void(String)>& callback) override;
+ void Set(const String& url,
+ const String& cookie,
+ const Callback<void(bool)>& callback) override;
NetworkContext* context_;
GURL origin_;
diff --git a/mojo/services/network/main.cc b/mojo/services/network/main.cc
index 27c0d85..182ddf5 100644
--- a/mojo/services/network/main.cc
+++ b/mojo/services/network/main.cc
@@ -22,7 +22,7 @@
public:
Delegate() {}
- virtual void Initialize(mojo::ApplicationImpl* app) override {
+ void Initialize(mojo::ApplicationImpl* app) override {
base::FilePath base_path;
CHECK(PathService::Get(base::DIR_TEMP, &base_path));
base_path = base_path.Append(FILE_PATH_LITERAL("network_service"));
@@ -30,7 +30,7 @@
}
// mojo::ApplicationDelegate implementation.
- virtual bool ConfigureIncomingConnection(
+ bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) override {
DCHECK(context_);
connection->AddService(this);
@@ -38,9 +38,8 @@
}
// mojo::InterfaceFactory<mojo::NetworkService> implementation.
- virtual void Create(
- mojo::ApplicationConnection* connection,
- mojo::InterfaceRequest<mojo::NetworkService> request) override {
+ void Create(mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::NetworkService> request) override {
mojo::BindToRequest(
new mojo::NetworkServiceImpl(connection, context_.get()), &request);
}
diff --git a/mojo/services/network/net_adapters.h b/mojo/services/network/net_adapters.h
index 89c6976..ea6317e 100644
--- a/mojo/services/network/net_adapters.h
+++ b/mojo/services/network/net_adapters.h
@@ -67,7 +67,7 @@
explicit NetToMojoIOBuffer(NetToMojoPendingBuffer* pending_buffer);
private:
- virtual ~NetToMojoIOBuffer();
+ ~NetToMojoIOBuffer() override;
scoped_refptr<NetToMojoPendingBuffer> pending_buffer_;
};
@@ -118,7 +118,7 @@
explicit MojoToNetIOBuffer(MojoToNetPendingBuffer* pending_buffer);
private:
- virtual ~MojoToNetIOBuffer();
+ ~MojoToNetIOBuffer() override;
scoped_refptr<MojoToNetPendingBuffer> pending_buffer_;
};
diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/network/network_service_impl.h
index 5ae2cfd..5d3376a 100644
--- a/mojo/services/network/network_service_impl.h
+++ b/mojo/services/network/network_service_impl.h
@@ -18,23 +18,23 @@
public:
NetworkServiceImpl(ApplicationConnection* connection,
NetworkContext* context);
- virtual ~NetworkServiceImpl();
+ ~NetworkServiceImpl() override;
// NetworkService methods:
- virtual void CreateURLLoader(InterfaceRequest<URLLoader> loader) override;
- virtual void GetCookieStore(InterfaceRequest<CookieStore> store) override;
- virtual void CreateWebSocket(InterfaceRequest<WebSocket> socket) override;
- virtual void CreateTCPBoundSocket(
+ void CreateURLLoader(InterfaceRequest<URLLoader> loader) override;
+ void GetCookieStore(InterfaceRequest<CookieStore> store) override;
+ void CreateWebSocket(InterfaceRequest<WebSocket> socket) override;
+ void CreateTCPBoundSocket(
NetAddressPtr local_address,
InterfaceRequest<TCPBoundSocket> bound_socket,
const Callback<void(NetworkErrorPtr, NetAddressPtr)>& callback) override;
- virtual void CreateTCPConnectedSocket(
+ void CreateTCPConnectedSocket(
NetAddressPtr remote_address,
ScopedDataPipeConsumerHandle send_stream,
ScopedDataPipeProducerHandle receive_stream,
InterfaceRequest<TCPConnectedSocket> client_socket,
const Callback<void(NetworkErrorPtr, NetAddressPtr)>& callback) override;
- virtual void CreateUDPSocket(InterfaceRequest<UDPSocket> socket) override;
+ void CreateUDPSocket(InterfaceRequest<UDPSocket> socket) override;
private:
NetworkContext* context_;
diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/network/tcp_bound_socket_impl.h
index 39a78f6..3dc4646 100644
--- a/mojo/services/network/tcp_bound_socket_impl.h
+++ b/mojo/services/network/tcp_bound_socket_impl.h
@@ -15,7 +15,7 @@
class TCPBoundSocketImpl : public InterfaceImpl<TCPBoundSocket> {
public:
TCPBoundSocketImpl();
- virtual ~TCPBoundSocketImpl();
+ ~TCPBoundSocketImpl() override;
// Does the actual binding. Returns a net error code. On net::OK, the bound
// socket will be ready to use and send back to the client. On failure, this
@@ -27,15 +27,13 @@
NetAddressPtr GetLocalAddress() const;
// TCPBoundSocket.
- virtual void StartListening(
- InterfaceRequest<TCPServerSocket> server,
- const Callback<void(NetworkErrorPtr)>& callback) override;
- virtual void Connect(
- NetAddressPtr remote_address,
- ScopedDataPipeConsumerHandle send_stream,
- ScopedDataPipeProducerHandle receive_stream,
- InterfaceRequest<TCPConnectedSocket> client_socket,
- const Callback<void(NetworkErrorPtr)>& callback) override;
+ void StartListening(InterfaceRequest<TCPServerSocket> server,
+ const Callback<void(NetworkErrorPtr)>& callback) override;
+ void Connect(NetAddressPtr remote_address,
+ ScopedDataPipeConsumerHandle send_stream,
+ ScopedDataPipeProducerHandle receive_stream,
+ InterfaceRequest<TCPConnectedSocket> client_socket,
+ const Callback<void(NetworkErrorPtr)>& callback) override;
private:
void OnConnected(int result);
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index e579b29..993802f 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -22,7 +22,7 @@
TCPConnectedSocketImpl(scoped_ptr<net::TCPSocket> socket,
ScopedDataPipeConsumerHandle send_stream,
ScopedDataPipeProducerHandle receive_stream);
- virtual ~TCPConnectedSocketImpl();
+ ~TCPConnectedSocketImpl() override;
private:
// "Receiving" in this context means reading from TCPSocket and writing to
diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/network/tcp_server_socket_impl.h
index c1f2e48..26d4942 100644
--- a/mojo/services/network/tcp_server_socket_impl.h
+++ b/mojo/services/network/tcp_server_socket_impl.h
@@ -19,14 +19,13 @@
// Passed ownership of a socket already in listening mode.
explicit TCPServerSocketImpl(scoped_ptr<net::TCPSocket> socket);
- virtual ~TCPServerSocketImpl();
+ ~TCPServerSocketImpl() override;
// TCPServerSocket.
- virtual void Accept(
- ScopedDataPipeConsumerHandle send_stream,
- ScopedDataPipeProducerHandle receive_stream,
- InterfaceRequest<TCPConnectedSocket> client_socket,
- const AcceptCallback& callback) override;
+ void Accept(ScopedDataPipeConsumerHandle send_stream,
+ ScopedDataPipeProducerHandle receive_stream,
+ InterfaceRequest<TCPConnectedSocket> client_socket,
+ const AcceptCallback& callback) override;
private:
void OnAcceptCompleted(int result);
diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp_socket_impl.h
index e4c4d28..1235716 100644
--- a/mojo/services/network/udp_socket_impl.h
+++ b/mojo/services/network/udp_socket_impl.h
@@ -24,33 +24,33 @@
class UDPSocketImpl : public InterfaceImpl<UDPSocket> {
public:
UDPSocketImpl();
- virtual ~UDPSocketImpl();
+ ~UDPSocketImpl() override;
// UDPSocket implementation.
- virtual void AllowAddressReuse(
+ void AllowAddressReuse(
const Callback<void(NetworkErrorPtr)>& callback) override;
- virtual void Bind(
+ void Bind(
NetAddressPtr addr,
const Callback<void(NetworkErrorPtr, NetAddressPtr)>& callback) override;
- virtual void SetSendBufferSize(
+ void SetSendBufferSize(
uint32_t size,
const Callback<void(NetworkErrorPtr)>& callback) override;
- virtual void SetReceiveBufferSize(
+ void SetReceiveBufferSize(
uint32_t size,
const Callback<void(NetworkErrorPtr)>& callback) override;
- virtual void NegotiateMaxPendingSendRequests(
+ void NegotiateMaxPendingSendRequests(
uint32_t requested_size,
const Callback<void(uint32_t)>& callback) override;
- virtual void ReceiveMore(uint32_t datagram_number) override;
+ void ReceiveMore(uint32_t datagram_number) override;
- virtual void SendTo(NetAddressPtr dest_addr,
- Array<uint8_t> data,
- const Callback<void(NetworkErrorPtr)>& callback) override;
+ void SendTo(NetAddressPtr dest_addr,
+ Array<uint8_t> data,
+ const Callback<void(NetworkErrorPtr)>& callback) override;
private:
struct PendingSendRequest {
diff --git a/mojo/services/network/udp_socket_unittest.cc b/mojo/services/network/udp_socket_unittest.cc
index dd38cf1..42bf61a 100644
--- a/mojo/services/network/udp_socket_unittest.cc
+++ b/mojo/services/network/udp_socket_unittest.cc
@@ -131,9 +131,9 @@
private:
struct State: public StateBase {
- virtual ~State() {}
+ ~State() override {}
- virtual void Run(NetworkErrorPtr result) const override {
+ void Run(NetworkErrorPtr result) const override {
if (test_callback_) {
TestCallback* callback = static_cast<TestCallback*>(test_callback_);
callback->result_ = result.Pass();
@@ -158,10 +158,9 @@
private:
struct State : public StateBase {
- virtual ~State() {}
+ ~State() override {}
- virtual void Run(NetworkErrorPtr result,
- NetAddressPtr net_address) const override {
+ void Run(NetworkErrorPtr result, NetAddressPtr net_address) const override {
if (test_callback_) {
TestCallbackWithAddress* callback =
static_cast<TestCallbackWithAddress*>(test_callback_);
@@ -188,9 +187,9 @@
private:
struct State : public StateBase {
- virtual ~State() {}
+ ~State() override {}
- virtual void Run(uint32_t result) const override {
+ void Run(uint32_t result) const override {
if (test_callback_) {
TestCallbackWithUint32* callback =
static_cast<TestCallbackWithUint32*>(test_callback_);
@@ -230,16 +229,16 @@
UDPSocketClientImpl() : run_loop_(nullptr), expected_receive_count_(0) {}
- virtual ~UDPSocketClientImpl() {
+ ~UDPSocketClientImpl() override {
while (!results_.empty()) {
delete results_.front();
results_.pop();
}
}
- virtual void OnReceived(NetworkErrorPtr result,
- NetAddressPtr src_addr,
- Array<uint8_t> data) override {
+ void OnReceived(NetworkErrorPtr result,
+ NetAddressPtr src_addr,
+ Array<uint8_t> data) override {
ReceiveResult* entry = new ReceiveResult();
entry->result = result.Pass();
entry->addr = src_addr.Pass();
diff --git a/mojo/services/network/url_loader_impl.cc b/mojo/services/network/url_loader_impl.cc
index 5e67c27..3f26378 100644
--- a/mojo/services/network/url_loader_impl.cc
+++ b/mojo/services/network/url_loader_impl.cc
@@ -55,26 +55,20 @@
public:
UploadDataPipeElementReader(ScopedDataPipeConsumerHandle pipe)
: pipe_(pipe.Pass()), num_bytes_(0) {}
- virtual ~UploadDataPipeElementReader() {}
+ ~UploadDataPipeElementReader() override {}
// UploadElementReader overrides:
- virtual int Init(const net::CompletionCallback& callback) override {
+ int Init(const net::CompletionCallback& callback) override {
offset_ = 0;
ReadDataRaw(pipe_.get(), NULL, &num_bytes_, MOJO_READ_DATA_FLAG_QUERY);
return net::OK;
}
- virtual uint64 GetContentLength() const override {
- return num_bytes_;
- }
- virtual uint64 BytesRemaining() const override {
- return num_bytes_ - offset_;
- }
- virtual bool IsInMemory() const override {
- return false;
- }
- virtual int Read(net::IOBuffer* buf,
- int buf_length,
- const net::CompletionCallback& callback) override {
+ uint64 GetContentLength() const override { return num_bytes_; }
+ uint64 BytesRemaining() const override { return num_bytes_ - offset_; }
+ bool IsInMemory() const override { return false; }
+ int Read(net::IOBuffer* buf,
+ int buf_length,
+ const net::CompletionCallback& callback) override {
uint32_t bytes_read =
std::min(static_cast<uint32_t>(BytesRemaining()),
static_cast<uint32_t>(buf_length));
diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url_loader_impl.h
index 76b4e52..dec48d5 100644
--- a/mojo/services/network/url_loader_impl.h
+++ b/mojo/services/network/url_loader_impl.h
@@ -22,25 +22,21 @@
public net::URLRequest::Delegate {
public:
explicit URLLoaderImpl(NetworkContext* context);
- virtual ~URLLoaderImpl();
+ ~URLLoaderImpl() override;
private:
// URLLoader methods:
- virtual void Start(
- URLRequestPtr request,
- const Callback<void(URLResponsePtr)>& callback) override;
- virtual void FollowRedirect(
- const Callback<void(URLResponsePtr)>& callback) override;
- virtual void QueryStatus(
- const Callback<void(URLLoaderStatusPtr)>& callback) override;
+ void Start(URLRequestPtr request,
+ const Callback<void(URLResponsePtr)>& callback) override;
+ void FollowRedirect(const Callback<void(URLResponsePtr)>& callback) override;
+ void QueryStatus(const Callback<void(URLLoaderStatusPtr)>& callback) override;
// net::URLRequest::Delegate methods:
- virtual void OnReceivedRedirect(net::URLRequest* url_request,
- const net::RedirectInfo& redirect_info,
- bool* defer_redirect) override;
- virtual void OnResponseStarted(net::URLRequest* url_request) override;
- virtual void OnReadCompleted(net::URLRequest* url_request, int bytes_read)
- override;
+ void OnReceivedRedirect(net::URLRequest* url_request,
+ const net::RedirectInfo& redirect_info,
+ bool* defer_redirect) override;
+ void OnResponseStarted(net::URLRequest* url_request) override;
+ void OnReadCompleted(net::URLRequest* url_request, int bytes_read) override;
void SendError(
int error,
diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc
index 7617562..ea0928f 100644
--- a/mojo/services/network/web_socket_impl.cc
+++ b/mojo/services/network/web_socket_impl.cc
@@ -65,28 +65,27 @@
WebSocketEventHandler(WebSocketClientPtr client)
: client_(client.Pass()) {
}
- virtual ~WebSocketEventHandler() {}
+ ~WebSocketEventHandler() override {}
private:
// net::WebSocketEventInterface methods:
- virtual ChannelState OnAddChannelResponse(
- bool fail,
- const std::string& selected_subprotocol,
- const std::string& extensions) override;
- virtual ChannelState OnDataFrame(bool fin,
- WebSocketMessageType type,
- const std::vector<char>& data) override;
- virtual ChannelState OnClosingHandshake() override;
- virtual ChannelState OnFlowControl(int64 quota) override;
- virtual ChannelState OnDropChannel(bool was_clean,
- uint16 code,
- const std::string& reason) override;
- virtual ChannelState OnFailChannel(const std::string& message) override;
- virtual ChannelState OnStartOpeningHandshake(
+ ChannelState OnAddChannelResponse(bool fail,
+ const std::string& selected_subprotocol,
+ const std::string& extensions) override;
+ ChannelState OnDataFrame(bool fin,
+ WebSocketMessageType type,
+ const std::vector<char>& data) override;
+ ChannelState OnClosingHandshake() override;
+ ChannelState OnFlowControl(int64 quota) override;
+ ChannelState OnDropChannel(bool was_clean,
+ uint16 code,
+ const std::string& reason) override;
+ ChannelState OnFailChannel(const std::string& message) override;
+ ChannelState OnStartOpeningHandshake(
scoped_ptr<net::WebSocketHandshakeRequestInfo> request) override;
- virtual ChannelState OnFinishOpeningHandshake(
+ ChannelState OnFinishOpeningHandshake(
scoped_ptr<net::WebSocketHandshakeResponseInfo> response) override;
- virtual ChannelState OnSSLCertificateError(
+ ChannelState OnSSLCertificateError(
scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks,
const GURL& url,
const net::SSLInfo& ssl_info,
diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h
index 31855df..a12ebf8 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -22,20 +22,18 @@
class WebSocketImpl : public InterfaceImpl<WebSocket> {
public:
explicit WebSocketImpl(NetworkContext* context);
- virtual ~WebSocketImpl();
+ ~WebSocketImpl() override;
private:
// WebSocket methods:
- virtual void Connect(const String& url,
- Array<String> protocols,
- const String& origin,
- ScopedDataPipeConsumerHandle send_stream,
- WebSocketClientPtr client) override;
- virtual void Send(bool fin,
- WebSocket::MessageType type,
- uint32_t num_bytes) override;
- virtual void FlowControl(int64_t quota) override;
- virtual void Close(uint16_t code, const String& reason) override;
+ void Connect(const String& url,
+ Array<String> protocols,
+ const String& origin,
+ ScopedDataPipeConsumerHandle send_stream,
+ WebSocketClientPtr client) override;
+ void Send(bool fin, WebSocket::MessageType type, uint32_t num_bytes) override;
+ void FlowControl(int64_t quota) override;
+ void Close(uint16_t code, const String& reason) override;
// Called with the data to send once it has been read from |send_stream_|.
void DidReadFromSendStream(bool fin,
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
index 330e07c..3818a36 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
@@ -72,11 +72,11 @@
class RootObserver : public ViewObserver {
public:
explicit RootObserver(View* root) : root_(root) {}
- virtual ~RootObserver() {}
+ ~RootObserver() override {}
private:
// Overridden from ViewObserver:
- virtual void OnViewDestroyed(View* view) override {
+ void OnViewDestroyed(View* view) override {
DCHECK_EQ(view, root_);
static_cast<ViewManagerClientImpl*>(
ViewPrivate(root_).view_manager())->RemoveRoot(root_);
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
index f2a2b8e..c9a4af4 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
@@ -28,7 +28,7 @@
public WindowManagerClient2 {
public:
ViewManagerClientImpl(ViewManagerDelegate* delegate, Shell* shell);
- virtual ~ViewManagerClientImpl();
+ ~ViewManagerClientImpl() override;
bool connected() const { return connected_; }
ConnectionSpecificId connection_id() const { return connection_id_; }
@@ -77,43 +77,42 @@
typedef std::map<Id, View*> IdToViewMap;
// Overridden from ViewManager:
- virtual const std::string& GetEmbedderURL() const override;
- virtual const std::vector<View*>& GetRoots() const override;
- virtual View* GetViewById(Id id) override;
+ const std::string& GetEmbedderURL() const override;
+ const std::vector<View*>& GetRoots() const override;
+ View* GetViewById(Id id) override;
// Overridden from InterfaceImpl:
- virtual void OnConnectionEstablished() override;
+ void OnConnectionEstablished() override;
// Overridden from ViewManagerClient:
- virtual void OnEmbed(ConnectionSpecificId connection_id,
- const String& creator_url,
- ViewDataPtr root,
- InterfaceRequest<ServiceProvider> services) override;
- virtual void OnViewBoundsChanged(Id view_id,
- RectPtr old_bounds,
- RectPtr new_bounds) override;
- virtual void OnViewHierarchyChanged(Id view_id,
- Id new_parent_id,
- Id old_parent_id,
- Array<ViewDataPtr> views) override;
- virtual void OnViewReordered(Id view_id,
- Id relative_view_id,
- OrderDirection direction) override;
- virtual void OnViewDeleted(Id view_id) override;
- virtual void OnViewVisibilityChanged(Id view_id, bool visible) override;
- virtual void OnViewDrawnStateChanged(Id view_id, bool drawn) override;
- virtual void OnViewInputEvent(Id view_id,
- EventPtr event,
- const Callback<void()>& callback) override;
+ void OnEmbed(ConnectionSpecificId connection_id,
+ const String& creator_url,
+ ViewDataPtr root,
+ InterfaceRequest<ServiceProvider> services) override;
+ void OnViewBoundsChanged(Id view_id,
+ RectPtr old_bounds,
+ RectPtr new_bounds) override;
+ void OnViewHierarchyChanged(Id view_id,
+ Id new_parent_id,
+ Id old_parent_id,
+ Array<ViewDataPtr> views) override;
+ void OnViewReordered(Id view_id,
+ Id relative_view_id,
+ OrderDirection direction) override;
+ void OnViewDeleted(Id view_id) override;
+ void OnViewVisibilityChanged(Id view_id, bool visible) override;
+ void OnViewDrawnStateChanged(Id view_id, bool drawn) override;
+ void OnViewInputEvent(Id view_id,
+ EventPtr event,
+ const Callback<void()>& callback) override;
// Overridden from WindowManagerClient2:
- virtual void OnWindowManagerReady() override;
- virtual void OnCaptureChanged(Id old_capture_view_id,
- Id new_capture_view_id) override;
- virtual void OnFocusChanged(Id old_focused_view_id,
- Id new_focused_view_id) override;
- virtual void OnActiveWindowChanged(Id old_focused_window,
- Id new_focused_window) override;
+ void OnWindowManagerReady() override;
+ void OnCaptureChanged(Id old_capture_view_id,
+ Id new_capture_view_id) override;
+ void OnFocusChanged(Id old_focused_view_id, Id new_focused_view_id) override;
+ void OnActiveWindowChanged(Id old_focused_window,
+ Id new_focused_window) override;
void RemoveRoot(View* root);
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h
index 28d3c24..439fa1c 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h
@@ -12,10 +12,10 @@
class ViewManagerTestSuite : public base::TestSuite {
public:
ViewManagerTestSuite(int argc, char** argv);
- virtual ~ViewManagerTestSuite();
+ ~ViewManagerTestSuite() override;
protected:
- virtual void Initialize() override;
+ void Initialize() override;
private:
DISALLOW_COPY_AND_ASSIGN(ViewManagerTestSuite);
diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
index d9609e2..3229b09 100644
--- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
+++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
@@ -49,19 +49,19 @@
explicit ConnectApplicationLoader(const LoadedCallback& callback)
: callback_(callback) {}
- virtual ~ConnectApplicationLoader() {}
+ ~ConnectApplicationLoader() override {}
private:
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* app) override {
+ void Initialize(ApplicationImpl* app) override {
view_manager_client_factory_.reset(
new ViewManagerClientFactory(app->shell(), this));
}
// Overridden from ApplicationLoader:
- virtual void Load(ApplicationManager* manager,
- const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
+ void Load(ApplicationManager* manager,
+ const GURL& url,
+ scoped_refptr<LoadCallbacks> callbacks) override {
ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
if (!shell_handle.is_valid())
return;
@@ -70,23 +70,22 @@
apps_.push_back(app.release());
}
- virtual void OnApplicationError(ApplicationManager* manager,
- const GURL& url) override {}
+ void OnApplicationError(ApplicationManager* manager,
+ const GURL& url) override {}
- virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
- override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
connection->AddService(view_manager_client_factory_.get());
return true;
}
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override {
+ void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) override {
callback_.Run(view_manager, root);
}
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
+ void OnViewManagerDisconnected(ViewManager* view_manager) override {}
ScopedVector<ApplicationImpl> apps_;
LoadedCallback callback_;
@@ -98,13 +97,13 @@
class BoundsChangeObserver : public ViewObserver {
public:
explicit BoundsChangeObserver(View* view) : view_(view) {}
- virtual ~BoundsChangeObserver() {}
+ ~BoundsChangeObserver() override {}
private:
// Overridden from ViewObserver:
- virtual void OnViewBoundsChanged(View* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
+ void OnViewBoundsChanged(View* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {
DCHECK_EQ(view, view_);
QuitRunLoop();
}
@@ -129,7 +128,7 @@
TreeSizeMatchesObserver(View* tree, size_t tree_size)
: tree_(tree),
tree_size_(tree_size) {}
- virtual ~TreeSizeMatchesObserver() {}
+ ~TreeSizeMatchesObserver() override {}
bool IsTreeCorrectSize() {
return CountViews(tree_) == tree_size_;
@@ -137,7 +136,7 @@
private:
// Overridden from ViewObserver:
- virtual void OnTreeChanged(const TreeChangeParams& params) override {
+ void OnTreeChanged(const TreeChangeParams& params) override {
if (IsTreeCorrectSize())
QuitRunLoop();
}
@@ -174,7 +173,7 @@
private:
// Overridden from ViewObserver:
- virtual void OnViewDestroyed(View* view) override {
+ void OnViewDestroyed(View* view) override {
std::set<Id>::iterator it = views_->find(view->id());
if (it != views_->end())
views_->erase(it);
@@ -208,15 +207,13 @@
OrderChangeObserver(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~OrderChangeObserver() {
- view_->RemoveObserver(this);
- }
+ ~OrderChangeObserver() override { view_->RemoveObserver(this); }
private:
// Overridden from ViewObserver:
- virtual void OnViewReordered(View* view,
- View* relative_view,
- OrderDirection direction) override {
+ void OnViewReordered(View* view,
+ View* relative_view,
+ OrderDirection direction) override {
DCHECK_EQ(view, view_);
QuitRunLoop();
}
@@ -237,7 +234,7 @@
explicit ViewTracker(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~ViewTracker() {
+ ~ViewTracker() override {
if (view_)
view_->RemoveObserver(this);
}
@@ -246,7 +243,7 @@
private:
// Overridden from ViewObserver:
- virtual void OnViewDestroyed(View* view) override {
+ void OnViewDestroyed(View* view) override {
DCHECK_EQ(view, view_);
view_ = NULL;
}
@@ -535,11 +532,11 @@
explicit VisibilityChangeObserver(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~VisibilityChangeObserver() { view_->RemoveObserver(this); }
+ ~VisibilityChangeObserver() override { view_->RemoveObserver(this); }
private:
// Overridden from ViewObserver:
- virtual void OnViewVisibilityChanged(View* view) override {
+ void OnViewVisibilityChanged(View* view) override {
EXPECT_EQ(view, view_);
QuitRunLoop();
}
@@ -597,11 +594,11 @@
explicit DrawnChangeObserver(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~DrawnChangeObserver() { view_->RemoveObserver(this); }
+ ~DrawnChangeObserver() override { view_->RemoveObserver(this); }
private:
// Overridden from ViewObserver:
- virtual void OnViewDrawnChanged(View* view) override {
+ void OnViewDrawnChanged(View* view) override {
EXPECT_EQ(view, view_);
QuitRunLoop();
}
diff --git a/mojo/services/public/cpp/view_manager/tests/view_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_unittest.cc
index ab8ef88..2fb5bfc 100644
--- a/mojo/services/public/cpp/view_manager/tests/view_unittest.cc
+++ b/mojo/services/public/cpp/view_manager/tests/view_unittest.cc
@@ -117,9 +117,7 @@
explicit TreeChangeObserver(View* observee) : observee_(observee) {
observee_->AddObserver(this);
}
- virtual ~TreeChangeObserver() {
- observee_->RemoveObserver(this);
- }
+ ~TreeChangeObserver() override { observee_->RemoveObserver(this); }
void Reset() {
received_params_.clear();
@@ -131,10 +129,10 @@
private:
// Overridden from ViewObserver:
- virtual void OnTreeChanging(const TreeChangeParams& params) override {
+ void OnTreeChanging(const TreeChangeParams& params) override {
received_params_.push_back(params);
}
- virtual void OnTreeChanged(const TreeChangeParams& params) override {
+ void OnTreeChanged(const TreeChangeParams& params) override {
received_params_.push_back(params);
}
@@ -353,9 +351,7 @@
explicit OrderChangeObserver(View* observee) : observee_(observee) {
observee_->AddObserver(this);
}
- virtual ~OrderChangeObserver() {
- observee_->RemoveObserver(this);
- }
+ ~OrderChangeObserver() override { observee_->RemoveObserver(this); }
Changes GetAndClearChanges() {
Changes changes;
@@ -365,15 +361,15 @@
private:
// Overridden from ViewObserver:
- virtual void OnViewReordering(View* view,
- View* relative_view,
- OrderDirection direction) override {
+ void OnViewReordering(View* view,
+ View* relative_view,
+ OrderDirection direction) override {
OnViewReordered(view, relative_view, direction);
}
- virtual void OnViewReordered(View* view,
- View* relative_view,
- OrderDirection direction) override {
+ void OnViewReordered(View* view,
+ View* relative_view,
+ OrderDirection direction) override {
Change change;
change.view = view;
change.relative_view = relative_view;
@@ -500,9 +496,7 @@
explicit BoundsChangeObserver(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~BoundsChangeObserver() {
- view_->RemoveObserver(this);
- }
+ ~BoundsChangeObserver() override { view_->RemoveObserver(this); }
Changes GetAndClearChanges() {
Changes changes;
@@ -512,9 +506,9 @@
private:
// Overridden from ViewObserver:
- virtual void OnViewBoundsChanging(View* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
+ void OnViewBoundsChanging(View* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {
changes_.push_back(
base::StringPrintf(
"view=%s old_bounds=%s new_bounds=%s phase=changing",
@@ -522,9 +516,9 @@
RectToString(old_bounds).c_str(),
RectToString(new_bounds).c_str()));
}
- virtual void OnViewBoundsChanged(View* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
+ void OnViewBoundsChanged(View* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {
changes_.push_back(
base::StringPrintf(
"view=%s old_bounds=%s new_bounds=%s phase=changed",
@@ -565,7 +559,7 @@
explicit VisibilityChangeObserver(View* view) : view_(view) {
view_->AddObserver(this);
}
- virtual ~VisibilityChangeObserver() { view_->RemoveObserver(this); }
+ ~VisibilityChangeObserver() override { view_->RemoveObserver(this); }
Changes GetAndClearChanges() {
Changes changes;
@@ -575,13 +569,13 @@
private:
// Overridden from ViewObserver:
- virtual void OnViewVisibilityChanging(View* view) override {
+ void OnViewVisibilityChanging(View* view) override {
changes_.push_back(
base::StringPrintf("view=%s phase=changing visibility=%s",
ViewIdToString(view->id()).c_str(),
view->visible() ? "true" : "false"));
}
- virtual void OnViewVisibilityChanged(View* view) override {
+ void OnViewVisibilityChanged(View* view) override {
changes_.push_back(base::StringPrintf("view=%s phase=changed visibility=%s",
ViewIdToString(view->id()).c_str(),
view->visible() ? "true" : "false"));
diff --git a/mojo/services/public/cpp/view_manager/view_manager_client_factory.h b/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
index d2ed548..c828900 100644
--- a/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
+++ b/mojo/services/public/cpp/view_manager/view_manager_client_factory.h
@@ -19,11 +19,11 @@
class ViewManagerClientFactory : public InterfaceFactory<ViewManagerClient> {
public:
ViewManagerClientFactory(Shell* shell, ViewManagerDelegate* delegate);
- virtual ~ViewManagerClientFactory();
+ ~ViewManagerClientFactory() override;
// InterfaceFactory<ViewManagerClient> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<ViewManagerClient> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<ViewManagerClient> request) override;
private:
Shell* shell_;
diff --git a/mojo/services/surfaces/surfaces_impl.h b/mojo/services/surfaces/surfaces_impl.h
index c074834..20599b8 100644
--- a/mojo/services/surfaces/surfaces_impl.h
+++ b/mojo/services/surfaces/surfaces_impl.h
@@ -34,28 +34,27 @@
SurfacesImpl(cc::SurfaceManager* manager,
uint32_t id_namespace,
Client* client);
- virtual ~SurfacesImpl();
+ ~SurfacesImpl() override;
// Surface implementation.
- virtual void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) override;
- virtual void SubmitFrame(SurfaceIdPtr id, FramePtr frame) override;
- virtual void DestroySurface(SurfaceIdPtr id) override;
- virtual void CreateGLES2BoundSurface(CommandBufferPtr gles2_client,
- SurfaceIdPtr id,
- mojo::SizePtr size) override;
+ void CreateSurface(SurfaceIdPtr id, mojo::SizePtr size) override;
+ void SubmitFrame(SurfaceIdPtr id, FramePtr frame) override;
+ void DestroySurface(SurfaceIdPtr id) override;
+ void CreateGLES2BoundSurface(CommandBufferPtr gles2_client,
+ SurfaceIdPtr id,
+ mojo::SizePtr size) override;
// SurfaceFactoryClient implementation.
- virtual void ReturnResources(
- const cc::ReturnedResourceArray& resources) override;
+ void ReturnResources(const cc::ReturnedResourceArray& resources) override;
// DisplayClient implementation.
- virtual void DisplayDamaged() override;
- virtual void DidSwapBuffers() override;
- virtual void DidSwapBuffersComplete() override;
- virtual void CommitVSyncParameters(base::TimeTicks timebase,
- base::TimeDelta interval) override;
- virtual void OutputSurfaceLost() override;
- virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
+ void DisplayDamaged() override;
+ void DidSwapBuffers() override;
+ void DidSwapBuffersComplete() override;
+ void CommitVSyncParameters(base::TimeTicks timebase,
+ base::TimeDelta interval) override;
+ void OutputSurfaceLost() override;
+ void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
cc::SurfaceFactory* factory() { return &factory_; }
diff --git a/mojo/services/surfaces/surfaces_service_application.h b/mojo/services/surfaces/surfaces_service_application.h
index c2fc8db..3a6aa1c 100644
--- a/mojo/services/surfaces/surfaces_service_application.h
+++ b/mojo/services/surfaces/surfaces_service_application.h
@@ -21,19 +21,18 @@
public SurfacesImpl::Client {
public:
SurfacesServiceApplication();
- virtual ~SurfacesServiceApplication();
+ ~SurfacesServiceApplication() override;
// ApplicationDelegate implementation.
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override;
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
// InterfaceFactory<SurfacsServicee> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<SurfacesService> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<SurfacesService> request) override;
// SurfacesImpl::Client implementation.
- virtual void FrameSubmitted() override;
- virtual void SetDisplay(cc::Display*) override;
+ void FrameSubmitted() override;
+ void SetDisplay(cc::Display*) override;
private:
cc::SurfaceManager manager_;
diff --git a/mojo/services/surfaces/surfaces_service_impl.h b/mojo/services/surfaces/surfaces_service_impl.h
index a620872..37df510 100644
--- a/mojo/services/surfaces/surfaces_service_impl.h
+++ b/mojo/services/surfaces/surfaces_service_impl.h
@@ -22,11 +22,12 @@
SurfacesServiceImpl(cc::SurfaceManager* manager,
uint32_t* next_id_namespace,
SurfacesImpl::Client* client);
- virtual ~SurfacesServiceImpl();
+ ~SurfacesServiceImpl() override;
// InterfaceImpl<SurfacesService> implementation.
- virtual void CreateSurfaceConnection(const mojo::Callback<
- void(mojo::SurfacePtr, uint32_t)>& callback) override;
+ void CreateSurfaceConnection(
+ const mojo::Callback<void(mojo::SurfacePtr, uint32_t)>& callback)
+ override;
private:
cc::SurfaceManager* manager_;
diff --git a/mojo/services/test_service/test_request_tracker_application.h b/mojo/services/test_service/test_request_tracker_application.h
index b519a91..699eefd 100644
--- a/mojo/services/test_service/test_request_tracker_application.h
+++ b/mojo/services/test_service/test_request_tracker_application.h
@@ -19,15 +19,14 @@
public InterfaceFactory<TestTimeService> {
public:
TestRequestTrackerApplication();
- virtual ~TestRequestTrackerApplication();
+ ~TestRequestTrackerApplication() override;
// ApplicationDelegate methods:
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override;
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
// InterfaceFactory<TestTimeService> methods:
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<TestTimeService> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<TestTimeService> request) override;
private:
TrackingContext context_;
diff --git a/mojo/services/test_service/test_request_tracker_client_impl.h b/mojo/services/test_service/test_request_tracker_client_impl.h
index 91340cb..16f5cba 100644
--- a/mojo/services/test_service/test_request_tracker_client_impl.h
+++ b/mojo/services/test_service/test_request_tracker_client_impl.h
@@ -17,13 +17,13 @@
TestRequestTrackerPtr tracker,
const std::string& service_name,
const mojo::Callback<void()>& tracking_connected_callback);
- virtual ~TestRequestTrackerClientImpl();
+ ~TestRequestTrackerClientImpl() override;
// Call whenever an event happens that you want to be recorded.
void RecordNewRequest();
// TestRequestTrackerClient impl.
- virtual void SetIdAndReturnName(
+ void SetIdAndReturnName(
uint64_t id,
const mojo::Callback<void(mojo::String)>& callback) override;
diff --git a/mojo/services/test_service/test_request_tracker_impl.h b/mojo/services/test_service/test_request_tracker_impl.h
index 736cc70..d2104dc 100644
--- a/mojo/services/test_service/test_request_tracker_impl.h
+++ b/mojo/services/test_service/test_request_tracker_impl.h
@@ -28,13 +28,13 @@
class TestRequestTrackerImpl : public InterfaceImpl<TestRequestTracker> {
public:
explicit TestRequestTrackerImpl(TrackingContext* context);
- virtual ~TestRequestTrackerImpl();
+ ~TestRequestTrackerImpl() override;
// TestRequestTracker.
- virtual void RecordStats(uint64_t client_id, ServiceStatsPtr stats) override;
+ void RecordStats(uint64_t client_id, ServiceStatsPtr stats) override;
// InterfaceImpl override.
- virtual void OnConnectionEstablished() override;
+ void OnConnectionEstablished() override;
private:
void UploaderNameCallback(uint64_t id, const mojo::String& name);
@@ -47,12 +47,11 @@
: public InterfaceImpl<TestTrackedRequestService> {
public:
explicit TestTrackedRequestServiceImpl(TrackingContext* context);
- virtual ~TestTrackedRequestServiceImpl();
+ ~TestTrackedRequestServiceImpl() override;
// |TestTrackedRequestService| implementation.
- virtual void GetReport(
- const mojo::Callback<void(mojo::Array<ServiceReportPtr>)>& callback)
- override;
+ void GetReport(const mojo::Callback<void(mojo::Array<ServiceReportPtr>)>&
+ callback) override;
private:
TrackingContext* context_;
diff --git a/mojo/services/test_service/test_service_application.h b/mojo/services/test_service/test_service_application.h
index 47743a1..49fcdda 100644
--- a/mojo/services/test_service/test_service_application.h
+++ b/mojo/services/test_service/test_service_application.h
@@ -21,19 +21,18 @@
public InterfaceFactory<TestTimeService> {
public:
TestServiceApplication();
- virtual ~TestServiceApplication();
+ ~TestServiceApplication() override;
// ApplicationDelegate implementation.
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override;
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
// InterfaceFactory<TestService> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<TestService> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<TestService> request) override;
// InterfaceFactory<TestTimeService> implementation.
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<TestTimeService> request) override;
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<TestTimeService> request) override;
void AddRef();
void ReleaseRef();
diff --git a/mojo/services/test_service/test_service_impl.h b/mojo/services/test_service/test_service_impl.h
index 379f02e..904320b 100644
--- a/mojo/services/test_service/test_service_impl.h
+++ b/mojo/services/test_service/test_service_impl.h
@@ -20,17 +20,16 @@
public:
TestServiceImpl(ApplicationConnection* connection,
TestServiceApplication* application);
- virtual ~TestServiceImpl();
+ ~TestServiceImpl() override;
// |TestService| methods:
- virtual void OnConnectionEstablished() override;
- virtual void OnConnectionError() override;
- virtual void Ping(const mojo::Callback<void()>& callback) override;
- virtual void ConnectToAppAndGetTime(
+ void OnConnectionEstablished() override;
+ void OnConnectionError() override;
+ void Ping(const mojo::Callback<void()>& callback) override;
+ void ConnectToAppAndGetTime(
const mojo::String& app_url,
const mojo::Callback<void(int64_t)>& callback) override;
- virtual void StartTrackingRequests(
- const mojo::Callback<void()>& callback) override;
+ void StartTrackingRequests(const mojo::Callback<void()>& callback) override;
private:
TestServiceApplication* const application_;
diff --git a/mojo/services/test_service/test_time_service_impl.h b/mojo/services/test_service/test_time_service_impl.h
index c9eaea2..212eb02 100644
--- a/mojo/services/test_service/test_time_service_impl.h
+++ b/mojo/services/test_service/test_time_service_impl.h
@@ -20,13 +20,12 @@
class TestTimeServiceImpl : public InterfaceImpl<TestTimeService> {
public:
explicit TestTimeServiceImpl(ApplicationConnection* application);
- virtual ~TestTimeServiceImpl();
+ ~TestTimeServiceImpl() override;
// |TestTimeService| methods:
- virtual void GetPartyTime(
+ void GetPartyTime(
const mojo::Callback<void(int64_t time_usec)>& callback) override;
- virtual void StartTrackingRequests(
- const mojo::Callback<void()>& callback) override;
+ void StartTrackingRequests(const mojo::Callback<void()>& callback) override;
private:
ApplicationConnection* application_;
diff --git a/mojo/services/view_manager/connection_manager.h b/mojo/services/view_manager/connection_manager.h
index 1917439..618460f 100644
--- a/mojo/services/view_manager/connection_manager.h
+++ b/mojo/services/view_manager/connection_manager.h
@@ -68,7 +68,7 @@
ConnectionManager(ApplicationConnection* app_connection,
const Callback<void()>& native_viewport_closed_callback);
- virtual ~ConnectionManager();
+ ~ConnectionManager() override;
// Returns the id for the next ViewManagerServiceImpl.
ConnectionSpecificId GetAndAdvanceNextConnectionId();
@@ -164,21 +164,21 @@
InterfaceRequest<ServiceProvider> service_provider);
// Overridden from ServerViewDelegate:
- virtual void OnViewDestroyed(const ServerView* view) override;
- virtual void OnWillChangeViewHierarchy(const ServerView* view,
- const ServerView* new_parent,
- const ServerView* old_parent) override;
- virtual void OnViewHierarchyChanged(const ServerView* view,
- const ServerView* new_parent,
- const ServerView* old_parent) override;
- virtual void OnViewBoundsChanged(const ServerView* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override;
- virtual void OnViewSurfaceIdChanged(const ServerView* view) override;
- virtual void OnViewReordered(const ServerView* view,
- const ServerView* relative,
- OrderDirection direction) override;
- virtual void OnWillChangeViewVisibility(const ServerView* view) override;
+ void OnViewDestroyed(const ServerView* view) override;
+ void OnWillChangeViewHierarchy(const ServerView* view,
+ const ServerView* new_parent,
+ const ServerView* old_parent) override;
+ void OnViewHierarchyChanged(const ServerView* view,
+ const ServerView* new_parent,
+ const ServerView* old_parent) override;
+ void OnViewBoundsChanged(const ServerView* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override;
+ void OnViewSurfaceIdChanged(const ServerView* view) override;
+ void OnViewReordered(const ServerView* view,
+ const ServerView* relative,
+ OrderDirection direction) override;
+ void OnWillChangeViewVisibility(const ServerView* view) override;
ApplicationConnection* app_connection_;
diff --git a/mojo/services/view_manager/default_access_policy.h b/mojo/services/view_manager/default_access_policy.h
index d8c0194..a57ecc2 100644
--- a/mojo/services/view_manager/default_access_policy.h
+++ b/mojo/services/view_manager/default_access_policy.h
@@ -18,24 +18,23 @@
public:
DefaultAccessPolicy(ConnectionSpecificId connection_id,
AccessPolicyDelegate* delegate);
- virtual ~DefaultAccessPolicy();
+ ~DefaultAccessPolicy() override;
// AccessPolicy:
- virtual bool CanRemoveViewFromParent(const ServerView* view) const override;
- virtual bool CanAddView(const ServerView* parent,
- const ServerView* child) const override;
- virtual bool CanReorderView(const ServerView* view,
- const ServerView* relative_view,
- OrderDirection direction) const override;
- virtual bool CanDeleteView(const ServerView* view) const override;
- virtual bool CanGetViewTree(const ServerView* view) const override;
- virtual bool CanDescendIntoViewForViewTree(
- const ServerView* view) const override;
- virtual bool CanEmbed(const ServerView* view) const override;
- virtual bool CanChangeViewVisibility(const ServerView* view) const override;
- virtual bool CanSetViewSurfaceId(const ServerView* view) const override;
- virtual bool CanSetViewBounds(const ServerView* view) const override;
- virtual bool ShouldNotifyOnHierarchyChange(
+ bool CanRemoveViewFromParent(const ServerView* view) const override;
+ bool CanAddView(const ServerView* parent,
+ const ServerView* child) const override;
+ bool CanReorderView(const ServerView* view,
+ const ServerView* relative_view,
+ OrderDirection direction) const override;
+ bool CanDeleteView(const ServerView* view) const override;
+ bool CanGetViewTree(const ServerView* view) const override;
+ bool CanDescendIntoViewForViewTree(const ServerView* view) const override;
+ bool CanEmbed(const ServerView* view) const override;
+ bool CanChangeViewVisibility(const ServerView* view) const override;
+ bool CanSetViewSurfaceId(const ServerView* view) const override;
+ bool CanSetViewBounds(const ServerView* view) const override;
+ bool ShouldNotifyOnHierarchyChange(
const ServerView* view,
const ServerView** new_parent,
const ServerView** old_parent) const override;
diff --git a/mojo/services/view_manager/display_manager.h b/mojo/services/view_manager/display_manager.h
index 8b95a57..1f5f930 100644
--- a/mojo/services/view_manager/display_manager.h
+++ b/mojo/services/view_manager/display_manager.h
@@ -40,7 +40,7 @@
DisplayManager(ApplicationConnection* app_connection,
ConnectionManager* connection_manager,
const Callback<void()>& native_viewport_closed_callback);
- virtual ~DisplayManager();
+ ~DisplayManager() override;
// Schedules a paint for the specified region of the specified view.
void SchedulePaint(const ServerView* view, const gfx::Rect& bounds);
@@ -54,13 +54,12 @@
void Draw();
// NativeViewportClient implementation.
- virtual void OnDestroyed() override;
- virtual void OnSizeChanged(SizePtr size) override;
- virtual void OnEvent(EventPtr event,
- const mojo::Callback<void()>& callback) override;
+ void OnDestroyed() override;
+ void OnSizeChanged(SizePtr size) override;
+ void OnEvent(EventPtr event, const mojo::Callback<void()>& callback) override;
// SurfaceClient implementation.
- virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override;
+ void ReturnResources(Array<ReturnedResourcePtr> resources) override;
ConnectionManager* connection_manager_;
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index cd14dc0..39c48d6 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -16,10 +16,9 @@
public InterfaceFactory<ViewManagerInitService> {
public:
ViewManagerApp() {}
- virtual ~ViewManagerApp() {}
+ ~ViewManagerApp() override {}
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
context_.ConfigureIncomingConnection(connection);
// TODO(sky): this needs some sort of authentication as well as making sure
// we only ever have one active at a time.
@@ -27,9 +26,8 @@
return true;
}
- virtual void Create(
- ApplicationConnection* connection,
- InterfaceRequest<ViewManagerInitService> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<ViewManagerInitService> request) override {
BindToRequest(new ViewManagerInitServiceImpl(connection, &context_),
&request);
}
diff --git a/mojo/services/view_manager/view_manager_init_service_impl.h b/mojo/services/view_manager/view_manager_init_service_impl.h
index 63fbc38..b36efbe 100644
--- a/mojo/services/view_manager/view_manager_init_service_impl.h
+++ b/mojo/services/view_manager/view_manager_init_service_impl.h
@@ -34,13 +34,13 @@
public:
ViewManagerInitServiceImpl(ApplicationConnection* connection,
ViewManagerInitServiceContext* context);
- virtual ~ViewManagerInitServiceImpl();
+ ~ViewManagerInitServiceImpl() override;
private:
// ViewManagerInitService overrides:
- virtual void Embed(const String& url,
- ServiceProviderPtr service_provider,
- const Callback<void(bool)>& callback) override;
+ void Embed(const String& url,
+ ServiceProviderPtr service_provider,
+ const Callback<void(bool)>& callback) override;
ViewManagerInitServiceContext* context_;
diff --git a/mojo/services/view_manager/view_manager_service_impl.h b/mojo/services/view_manager/view_manager_service_impl.h
index c77f285..bb15fcd 100644
--- a/mojo/services/view_manager/view_manager_service_impl.h
+++ b/mojo/services/view_manager/view_manager_service_impl.h
@@ -47,7 +47,7 @@
const std::string& url,
const ViewId& root_id,
InterfaceRequest<ServiceProvider> service_provider);
- virtual ~ViewManagerServiceImpl();
+ ~ViewManagerServiceImpl() override;
// Used to mark this connection as originating from a call to
// ViewManagerService::Connect(). When set OnConnectionError() deletes |this|.
@@ -96,7 +96,7 @@
// TODO(sky): move this to private section (currently can't because of
// bindings).
// InterfaceImp overrides:
- virtual void OnConnectionError() override;
+ void OnConnectionError() override;
private:
typedef std::map<ConnectionSpecificId, ServerView*> ViewMap;
@@ -147,45 +147,42 @@
void NotifyDrawnStateChanged(const ServerView* view, bool new_drawn_value);
// ViewManagerService:
- virtual void CreateView(Id transport_view_id,
- const Callback<void(ErrorCode)>& callback) override;
- virtual void DeleteView(Id transport_view_id,
- const Callback<void(bool)>& callback) override;
- virtual void AddView(Id parent_id,
- Id child_id,
- const Callback<void(bool)>& callback) override;
- virtual void RemoveViewFromParent(
- Id view_id,
- const Callback<void(bool)>& callback) override;
- virtual void ReorderView(Id view_id,
- Id relative_view_id,
- OrderDirection direction,
- const Callback<void(bool)>& callback) override;
- virtual void GetViewTree(
- Id view_id,
- const Callback<void(Array<ViewDataPtr>)>& callback) override;
- virtual void SetViewSurfaceId(Id view_id,
- SurfaceIdPtr surface_id,
- const Callback<void(bool)>& callback) override;
- virtual void SetViewBounds(Id view_id,
- RectPtr bounds,
- const Callback<void(bool)>& callback) override;
- virtual void SetViewVisibility(Id view_id,
- bool visible,
- const Callback<void(bool)>& callback) override;
- virtual void Embed(const String& url,
- Id view_id,
- ServiceProviderPtr service_provider,
+ void CreateView(Id transport_view_id,
+ const Callback<void(ErrorCode)>& callback) override;
+ void DeleteView(Id transport_view_id,
+ const Callback<void(bool)>& callback) override;
+ void AddView(Id parent_id,
+ Id child_id,
+ const Callback<void(bool)>& callback) override;
+ void RemoveViewFromParent(Id view_id,
+ const Callback<void(bool)>& callback) override;
+ void ReorderView(Id view_id,
+ Id relative_view_id,
+ OrderDirection direction,
+ const Callback<void(bool)>& callback) override;
+ void GetViewTree(Id view_id,
+ const Callback<void(Array<ViewDataPtr>)>& callback) override;
+ void SetViewSurfaceId(Id view_id,
+ SurfaceIdPtr surface_id,
+ const Callback<void(bool)>& callback) override;
+ void SetViewBounds(Id view_id,
+ RectPtr bounds,
const Callback<void(bool)>& callback) override;
+ void SetViewVisibility(Id view_id,
+ bool visible,
+ const Callback<void(bool)>& callback) override;
+ void Embed(const String& url,
+ Id view_id,
+ ServiceProviderPtr service_provider,
+ const Callback<void(bool)>& callback) override;
// InterfaceImpl:
- virtual void OnConnectionEstablished() override;
+ void OnConnectionEstablished() override;
// AccessPolicyDelegate:
- virtual const base::hash_set<Id>& GetRootsForAccessPolicy() const override;
- virtual bool IsViewKnownForAccessPolicy(
- const ServerView* view) const override;
- virtual bool IsViewRootOfAnotherConnectionForAccessPolicy(
+ const base::hash_set<Id>& GetRootsForAccessPolicy() const override;
+ bool IsViewKnownForAccessPolicy(const ServerView* view) const override;
+ bool IsViewRootOfAnotherConnectionForAccessPolicy(
const ServerView* view) const override;
ConnectionManager* connection_manager_;
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index abf874e..073ad4c 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -65,8 +65,7 @@
SetInstance(this);
}
- virtual ~ViewManagerProxy() {
- }
+ ~ViewManagerProxy() override {}
// Returns true if in an initial state. If this returns false it means the
// last test didn't clean up properly, or most likely didn't invoke
@@ -288,7 +287,7 @@
}
// TestChangeTracker::Delegate:
- virtual void OnChangeAdded() override {
+ void OnChangeAdded() override {
if (quit_count_ > 0 && --quit_count_ == 0)
QuitCountReached();
}
@@ -336,45 +335,44 @@
ViewManagerProxy* proxy() { return &proxy_; }
// InterfaceImpl:
- virtual void OnConnectionEstablished() override {
+ void OnConnectionEstablished() override {
proxy_.set_router(internal_state()->router());
proxy_.set_view_manager(client());
}
// ViewManagerClient:
- virtual void OnEmbed(
- ConnectionSpecificId connection_id,
- const String& creator_url,
- ViewDataPtr root,
- InterfaceRequest<ServiceProvider> services) override {
+ void OnEmbed(ConnectionSpecificId connection_id,
+ const String& creator_url,
+ ViewDataPtr root,
+ InterfaceRequest<ServiceProvider> services) override {
tracker_.OnEmbed(connection_id, creator_url, root.Pass());
}
- virtual void OnViewBoundsChanged(Id view_id,
- RectPtr old_bounds,
- RectPtr new_bounds) override {
+ void OnViewBoundsChanged(Id view_id,
+ RectPtr old_bounds,
+ RectPtr new_bounds) override {
tracker_.OnViewBoundsChanged(view_id, old_bounds.Pass(), new_bounds.Pass());
}
- virtual void OnViewHierarchyChanged(Id view,
- Id new_parent,
- Id old_parent,
- Array<ViewDataPtr> views) override {
+ void OnViewHierarchyChanged(Id view,
+ Id new_parent,
+ Id old_parent,
+ Array<ViewDataPtr> views) override {
tracker_.OnViewHierarchyChanged(view, new_parent, old_parent, views.Pass());
}
- virtual void OnViewReordered(Id view_id,
- Id relative_view_id,
- OrderDirection direction) override {
+ void OnViewReordered(Id view_id,
+ Id relative_view_id,
+ OrderDirection direction) override {
tracker_.OnViewReordered(view_id, relative_view_id, direction);
}
- virtual void OnViewDeleted(Id view) override { tracker_.OnViewDeleted(view); }
- virtual void OnViewVisibilityChanged(uint32_t view, bool visible) override {
+ void OnViewDeleted(Id view) override { tracker_.OnViewDeleted(view); }
+ void OnViewVisibilityChanged(uint32_t view, bool visible) override {
tracker_.OnViewVisibilityChanged(view, visible);
}
- virtual void OnViewDrawnStateChanged(uint32_t view, bool drawn) override {
+ void OnViewDrawnStateChanged(uint32_t view, bool drawn) override {
tracker_.OnViewDrawnStateChanged(view, drawn);
}
- virtual void OnViewInputEvent(Id view_id,
- EventPtr event,
- const Callback<void()>& callback) override {
+ void OnViewInputEvent(Id view_id,
+ EventPtr event,
+ const Callback<void()>& callback) override {
tracker_.OnViewInputEvent(view_id, event.Pass());
}
@@ -389,20 +387,19 @@
public:
explicit WindowManagerServiceImpl(TestViewManagerClientConnection* connection)
: connection_(connection) {}
- virtual ~WindowManagerServiceImpl() {}
+ ~WindowManagerServiceImpl() override {}
// InterfaceImpl:
- virtual void OnConnectionEstablished() override {
+ void OnConnectionEstablished() override {
connection_->proxy()->set_window_manager_client(client());
}
// WindowManagerService:
- virtual void Embed(
- const String& url,
- InterfaceRequest<ServiceProvider> service_provider) override {
+ void Embed(const String& url,
+ InterfaceRequest<ServiceProvider> service_provider) override {
connection_->tracker()->DelegateEmbed(url);
}
- virtual void OnViewInputEvent(mojo::EventPtr event) override {}
+ void OnViewInputEvent(mojo::EventPtr event) override {}
private:
TestViewManagerClientConnection* connection_;
@@ -418,12 +415,12 @@
public InterfaceFactory<WindowManagerService> {
public:
EmbedApplicationLoader() : last_view_manager_client_(nullptr) {}
- virtual ~EmbedApplicationLoader() {}
+ ~EmbedApplicationLoader() override {}
// ApplicationLoader implementation:
- virtual void Load(ApplicationManager* manager,
- const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
+ void Load(ApplicationManager* manager,
+ const GURL& url,
+ scoped_refptr<LoadCallbacks> callbacks) override {
ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
if (!shell_handle.is_valid())
return;
@@ -431,25 +428,24 @@
shell_handle.Pass()));
apps_.push_back(app.release());
}
- virtual void OnApplicationError(ApplicationManager* manager,
- const GURL& url) override {}
+ void OnApplicationError(ApplicationManager* manager,
+ const GURL& url) override {}
// ApplicationDelegate implementation:
- virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
- override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
connection->AddService<ViewManagerClient>(this);
connection->AddService<WindowManagerService>(this);
return true;
}
// InterfaceFactory<ViewManagerClient> implementation:
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<ViewManagerClient> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<ViewManagerClient> request) override {
last_view_manager_client_ = new TestViewManagerClientConnection;
BindToRequest(last_view_manager_client_, &request);
}
- virtual void Create(ApplicationConnection* connection,
- InterfaceRequest<WindowManagerService> request) override {
+ void Create(ApplicationConnection* connection,
+ InterfaceRequest<WindowManagerService> request) override {
BindToRequest(new WindowManagerServiceImpl(last_view_manager_client_),
&request);
}
diff --git a/mojo/services/view_manager/window_manager_access_policy.h b/mojo/services/view_manager/window_manager_access_policy.h
index aa44fd6..7b8e7a9 100644
--- a/mojo/services/view_manager/window_manager_access_policy.h
+++ b/mojo/services/view_manager/window_manager_access_policy.h
@@ -17,24 +17,23 @@
public:
WindowManagerAccessPolicy(ConnectionSpecificId connection_id,
AccessPolicyDelegate* delegate);
- virtual ~WindowManagerAccessPolicy();
+ ~WindowManagerAccessPolicy() override;
// AccessPolicy:
- virtual bool CanRemoveViewFromParent(const ServerView* view) const override;
- virtual bool CanAddView(const ServerView* parent,
- const ServerView* child) const override;
- virtual bool CanReorderView(const ServerView* view,
- const ServerView* relative_view,
- OrderDirection direction) const override;
- virtual bool CanDeleteView(const ServerView* view) const override;
- virtual bool CanGetViewTree(const ServerView* view) const override;
- virtual bool CanDescendIntoViewForViewTree(
- const ServerView* view) const override;
- virtual bool CanEmbed(const ServerView* view) const override;
- virtual bool CanChangeViewVisibility(const ServerView* view) const override;
- virtual bool CanSetViewSurfaceId(const ServerView* view) const override;
- virtual bool CanSetViewBounds(const ServerView* view) const override;
- virtual bool ShouldNotifyOnHierarchyChange(
+ bool CanRemoveViewFromParent(const ServerView* view) const override;
+ bool CanAddView(const ServerView* parent,
+ const ServerView* child) const override;
+ bool CanReorderView(const ServerView* view,
+ const ServerView* relative_view,
+ OrderDirection direction) const override;
+ bool CanDeleteView(const ServerView* view) const override;
+ bool CanGetViewTree(const ServerView* view) const override;
+ bool CanDescendIntoViewForViewTree(const ServerView* view) const override;
+ bool CanEmbed(const ServerView* view) const override;
+ bool CanChangeViewVisibility(const ServerView* view) const override;
+ bool CanSetViewSurfaceId(const ServerView* view) const override;
+ bool CanSetViewBounds(const ServerView* view) const override;
+ bool ShouldNotifyOnHierarchyChange(
const ServerView* view,
const ServerView** new_parent,
const ServerView** old_parent) const override;
diff --git a/mojo/services/view_manager/window_manager_client_impl.h b/mojo/services/view_manager/window_manager_client_impl.h
index b25aafe..704489d 100644
--- a/mojo/services/view_manager/window_manager_client_impl.h
+++ b/mojo/services/view_manager/window_manager_client_impl.h
@@ -30,14 +30,13 @@
: public InterfaceImpl<WindowManagerClient> {
public:
explicit WindowManagerClientImpl(ConnectionManager* connection_manager);
- virtual ~WindowManagerClientImpl();
+ ~WindowManagerClientImpl() override;
// WindowManagerClient:
- virtual void DispatchInputEventToView(Id transport_view_id,
- EventPtr event) override;
+ void DispatchInputEventToView(Id transport_view_id, EventPtr event) override;
// InterfaceImp overrides:
- virtual void OnConnectionError() override;
+ void OnConnectionError() override;
private:
ConnectionManager* connection_manager_;
diff --git a/mojo/services/window_manager/main.cc b/mojo/services/window_manager/main.cc
index 3e2d37c..028795b 100644
--- a/mojo/services/window_manager/main.cc
+++ b/mojo/services/window_manager/main.cc
@@ -26,33 +26,31 @@
: window_manager_app_(new WindowManagerApp(this, this)),
view_manager_(NULL),
root_(NULL) {}
- virtual ~DefaultWindowManager() {}
+ ~DefaultWindowManager() override {}
private:
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* impl) override {
+ void Initialize(ApplicationImpl* impl) override {
window_manager_app_->Initialize(impl);
}
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
window_manager_app_->ConfigureIncomingConnection(connection);
return true;
}
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override {
+ void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) override {
view_manager_ = view_manager;
root_ = root;
}
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
+ void OnViewManagerDisconnected(ViewManager* view_manager) override {}
// Overridden from WindowManagerDelegate:
- virtual void Embed(
- const String& url,
- InterfaceRequest<ServiceProvider> service_provider) override {
+ void Embed(const String& url,
+ InterfaceRequest<ServiceProvider> service_provider) override {
View* view = View::Create(view_manager_);
root_->AddChild(view);
view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
diff --git a/mojo/services/window_manager/window_manager_api_unittest.cc b/mojo/services/window_manager/window_manager_api_unittest.cc
index 7f89283..d5cad73 100644
--- a/mojo/services/window_manager/window_manager_api_unittest.cc
+++ b/mojo/services/window_manager/window_manager_api_unittest.cc
@@ -54,7 +54,7 @@
explicit TestWindowManagerClient(base::RunLoop* run_loop)
: run_loop_(run_loop) {}
- virtual ~TestWindowManagerClient() {}
+ ~TestWindowManagerClient() override {}
void set_focus_changed_callback(const TwoNodeCallback& callback) {
focus_changed_callback_ = callback;
@@ -65,16 +65,15 @@
private:
// Overridden from WindowManagerClient:
- virtual void OnWindowManagerReady() override { run_loop_->Quit(); }
- virtual void OnCaptureChanged(Id old_capture_node_id,
- Id new_capture_node_id) override {}
- virtual void OnFocusChanged(Id old_focused_node_id,
- Id new_focused_node_id) override {
+ void OnWindowManagerReady() override { run_loop_->Quit(); }
+ void OnCaptureChanged(Id old_capture_node_id,
+ Id new_capture_node_id) override {}
+ void OnFocusChanged(Id old_focused_node_id, Id new_focused_node_id) override {
if (!focus_changed_callback_.is_null())
focus_changed_callback_.Run(old_focused_node_id, new_focused_node_id);
}
- virtual void OnActiveWindowChanged(Id old_active_window,
- Id new_active_window) override {
+ void OnActiveWindowChanged(Id old_active_window,
+ Id new_active_window) override {
if (!active_window_changed_callback_.is_null())
active_window_changed_callback_.Run(old_active_window, new_active_window);
}
@@ -94,13 +93,13 @@
explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
: root_added_callback_(root_added_callback) {}
- virtual ~TestApplicationLoader() {}
+ ~TestApplicationLoader() override {}
private:
// Overridden from ApplicationLoader:
- virtual void Load(ApplicationManager* application_manager,
- const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
+ void Load(ApplicationManager* application_manager,
+ const GURL& url,
+ scoped_refptr<LoadCallbacks> callbacks) override {
ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
if (!shell_handle.is_valid())
return;
@@ -108,29 +107,28 @@
new ApplicationImpl(this, shell_handle.Pass()));
apps_.push_back(app.release());
}
- virtual void OnApplicationError(ApplicationManager* application_manager,
- const GURL& url) override {}
+ void OnApplicationError(ApplicationManager* application_manager,
+ const GURL& url) override {}
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* app) override {
+ void Initialize(ApplicationImpl* app) override {
view_manager_client_factory_.reset(
new ViewManagerClientFactory(app->shell(), this));
}
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override {
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
connection->AddService(view_manager_client_factory_.get());
return true;
}
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override {
+ void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) override {
root_added_callback_.Run(root);
}
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
+ void OnViewManagerDisconnected(ViewManager* view_manager) override {}
RootAddedCallback root_added_callback_;
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index ffd80a8..2852bd2 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -34,32 +34,34 @@
class DummyDelegate : public aura::WindowDelegate {
public:
DummyDelegate() {}
- virtual ~DummyDelegate() {}
+ ~DummyDelegate() override {}
private:
// WindowDelegate overrides:
- virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); }
- virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); }
- virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {}
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
+ gfx::Size GetMinimumSize() const override { return gfx::Size(); }
+ gfx::Size GetMaximumSize() const override { return gfx::Size(); }
+ void OnBoundsChanged(const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {}
+ gfx::NativeCursor GetCursor(const gfx::Point& point) override {
return gfx::kNullCursor;
}
- virtual int GetNonClientComponent(const gfx::Point& point) const override {
+ int GetNonClientComponent(const gfx::Point& point) const override {
return HTCAPTION;
}
- virtual bool ShouldDescendIntoChildForEventHandling(
+ bool ShouldDescendIntoChildForEventHandling(
aura::Window* child,
- const gfx::Point& location) override { return true; }
- virtual bool CanFocus() override { return true; }
- virtual void OnCaptureLost() override {}
- virtual void OnPaint(gfx::Canvas* canvas) override {}
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
- virtual void OnWindowDestroying(aura::Window* window) override {}
- virtual void OnWindowDestroyed(aura::Window* window) override {}
- virtual void OnWindowTargetVisibilityChanged(bool visible) override {}
- virtual bool HasHitTestMask() const override { return false; }
- virtual void GetHitTestMask(gfx::Path* mask) const override {}
+ const gfx::Point& location) override {
+ return true;
+ }
+ bool CanFocus() override { return true; }
+ void OnCaptureLost() override {}
+ void OnPaint(gfx::Canvas* canvas) override {}
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+ void OnWindowDestroying(aura::Window* window) override {}
+ void OnWindowDestroyed(aura::Window* window) override {}
+ void OnWindowTargetVisibilityChanged(bool visible) override {}
+ bool HasHitTestMask() const override { return false; }
+ void GetHitTestMask(gfx::Path* mask) const override {}
DISALLOW_COPY_AND_ASSIGN(DummyDelegate);
};
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index 8c9c244..c7d2dc3 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -64,7 +64,7 @@
public:
WindowManagerApp(ViewManagerDelegate* view_manager_delegate,
WindowManagerDelegate* window_manager_delegate);
- virtual ~WindowManagerApp();
+ ~WindowManagerApp() override;
static View* GetViewForWindow(aura::Window* window);
aura::Window* GetWindowForViewId(Id view);
@@ -95,39 +95,37 @@
}
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* impl) override;
- virtual bool ConfigureIncomingConnection(
- ApplicationConnection* connection) override;
+ void Initialize(ApplicationImpl* impl) override;
+ bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
private:
typedef std::set<WindowManagerService2Impl*> Connections;
typedef std::map<Id, aura::Window*> ViewIdToWindowMap;
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) override;
- virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
+ void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) override;
+ void OnViewManagerDisconnected(ViewManager* view_manager) override;
// Overridden from ViewObserver:
- virtual void OnTreeChanged(
- const ViewObserver::TreeChangeParams& params) override;
- virtual void OnViewDestroying(View* view) override;
- virtual void OnViewBoundsChanged(View* view,
- const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override;
+ void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
+ void OnViewDestroying(View* view) override;
+ void OnViewBoundsChanged(View* view,
+ const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override;
// Overridden from ui::EventHandler:
- virtual void OnEvent(ui::Event* event) override;
+ void OnEvent(ui::Event* event) override;
// Overridden from aura::client::FocusChangeObserver:
- virtual void OnWindowFocused(aura::Window* gained_focus,
- aura::Window* lost_focus) override;
+ void OnWindowFocused(aura::Window* gained_focus,
+ aura::Window* lost_focus) override;
// Overridden from aura::client::ActivationChangeObserver:
- virtual void OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) override;
+ void OnWindowActivated(aura::Window* gained_active,
+ aura::Window* lost_active) override;
// Creates an aura::Window for every view in the hierarchy beneath |view|,
// and adds to the registry so that it can be retrieved later via
diff --git a/mojo/services/window_manager/window_manager_service2_impl.h b/mojo/services/window_manager/window_manager_service2_impl.h
index be129b4..a09db91 100644
--- a/mojo/services/window_manager/window_manager_service2_impl.h
+++ b/mojo/services/window_manager/window_manager_service2_impl.h
@@ -16,7 +16,7 @@
class WindowManagerService2Impl : public InterfaceImpl<WindowManagerService2> {
public:
explicit WindowManagerService2Impl(WindowManagerApp* manager);
- virtual ~WindowManagerService2Impl();
+ ~WindowManagerService2Impl() override;
void NotifyReady();
void NotifyViewFocused(Id new_focused_id, Id old_focused_id);
@@ -24,15 +24,12 @@
private:
// Overridden from WindowManagerService:
- virtual void SetCapture(Id view,
- const Callback<void(bool)>& callback) override;
- virtual void FocusWindow(Id view,
- const Callback<void(bool)>& callback) override;
- virtual void ActivateWindow(Id view,
- const Callback<void(bool)>& callback) override;
+ void SetCapture(Id view, const Callback<void(bool)>& callback) override;
+ void FocusWindow(Id view, const Callback<void(bool)>& callback) override;
+ void ActivateWindow(Id view, const Callback<void(bool)>& callback) override;
// Overridden from InterfaceImpl:
- virtual void OnConnectionEstablished() override;
+ void OnConnectionEstablished() override;
WindowManagerApp* window_manager_;
diff --git a/mojo/services/window_manager/window_manager_service_impl.h b/mojo/services/window_manager/window_manager_service_impl.h
index ba2d29e..39349c2 100644
--- a/mojo/services/window_manager/window_manager_service_impl.h
+++ b/mojo/services/window_manager/window_manager_service_impl.h
@@ -15,17 +15,16 @@
class WindowManagerServiceImpl : public InterfaceImpl<WindowManagerService> {
public:
explicit WindowManagerServiceImpl(WindowManagerApp* app);
- virtual ~WindowManagerServiceImpl();
+ ~WindowManagerServiceImpl() override;
private:
// WindowManagerServiceImpl:
- virtual void Embed(
- const String& url,
- InterfaceRequest<ServiceProvider> service_provider) override;
- virtual void OnViewInputEvent(mojo::EventPtr event) override;
+ void Embed(const String& url,
+ InterfaceRequest<ServiceProvider> service_provider) override;
+ void OnViewInputEvent(mojo::EventPtr event) override;
// InterfaceImpl:
- virtual void OnConnectionEstablished() override;
+ void OnConnectionEstablished() override;
WindowManagerApp* app_;
diff --git a/mojo/services/window_manager/window_manager_unittests.cc b/mojo/services/window_manager/window_manager_unittests.cc
index dbd9a48..dd05b45 100644
--- a/mojo/services/window_manager/window_manager_unittests.cc
+++ b/mojo/services/window_manager/window_manager_unittests.cc
@@ -16,10 +16,10 @@
class WindowManagerTestSuite : public base::TestSuite {
public:
WindowManagerTestSuite(int argc, char** argv) : TestSuite(argc, argv) {}
- virtual ~WindowManagerTestSuite() {}
+ ~WindowManagerTestSuite() override {}
protected:
- virtual void Initialize() override {
+ void Initialize() override {
#if defined(USE_X11)
// Each test ends up creating a new thread for the native viewport service.
// In other words we'll use X on different threads, so tell it that.
