Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3235)

Unified Diff: athena/wm/window_manager_impl.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.h
diff --git a/athena/wm/window_manager_impl.h b/athena/wm/window_manager_impl.h
index da1c920570614bcfc9446bf613b4f8f0f1e0c7ca..bd02244107a3f19a41002480ec176479a1689804 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -37,15 +37,15 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
public TitleDragControllerDelegate {
public:
WindowManagerImpl();
- virtual ~WindowManagerImpl();
+ ~WindowManagerImpl() override;
void ToggleSplitView();
// WindowManager:
- virtual void EnterOverview() override;
+ void EnterOverview() override;
// Exits overview and activates the previously active activity
- virtual void ExitOverview() override;
- virtual bool IsOverviewModeActive() override;
+ void ExitOverview() override;
+ bool IsOverviewModeActive() override;
private:
friend class test::WindowManagerImplTestApi;
@@ -70,30 +70,30 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
void InstallAccelerators();
// WindowManager:
- virtual void AddObserver(WindowManagerObserver* observer) override;
- virtual void RemoveObserver(WindowManagerObserver* observer) override;
- virtual void ToggleSplitViewForTest() override;
- virtual WindowListProvider* GetWindowListProvider() override;
+ void AddObserver(WindowManagerObserver* observer) override;
+ void RemoveObserver(WindowManagerObserver* observer) override;
+ void ToggleSplitViewForTest() override;
+ WindowListProvider* GetWindowListProvider() override;
// WindowOverviewModeDelegate:
- virtual void OnSelectWindow(aura::Window* window) override;
- virtual void OnSelectSplitViewWindow(aura::Window* left,
- aura::Window* right,
- aura::Window* to_activate) override;
+ void OnSelectWindow(aura::Window* window) override;
+ void OnSelectSplitViewWindow(aura::Window* left,
+ aura::Window* right,
+ aura::Window* to_activate) override;
// aura::WindowObserver:
- virtual void OnWindowDestroying(aura::Window* window) override;
+ void OnWindowDestroying(aura::Window* window) override;
// AcceleratorHandler:
- virtual bool IsCommandEnabled(int command_id) const override;
- virtual bool OnAcceleratorFired(int command_id,
- const ui::Accelerator& accelerator) override;
+ bool IsCommandEnabled(int command_id) const override;
+ bool OnAcceleratorFired(int command_id,
+ const ui::Accelerator& accelerator) override;
// TitleDragControllerDelegate:
- virtual aura::Window* GetWindowBehind(aura::Window* window) override;
- virtual void OnTitleDragStarted(aura::Window* window) override;
- virtual void OnTitleDragCompleted(aura::Window* window) override;
- virtual void OnTitleDragCanceled(aura::Window* window) override;
+ aura::Window* GetWindowBehind(aura::Window* window) override;
+ void OnTitleDragStarted(aura::Window* window) override;
+ void OnTitleDragCompleted(aura::Window* window) override;
+ void OnTitleDragCanceled(aura::Window* window) override;
scoped_ptr<aura::Window> container_;
scoped_ptr<WindowListProviderImpl> window_list_provider_;
« no previous file with comments | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698