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

Side by Side Diff: athena/wm/window_manager_impl.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 unified diff | Download patch
« no previous file with comments | « athena/wm/window_manager_impl.h ('k') | athena/wm/window_overview_mode.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/wm/window_manager_impl.h" 5 #include "athena/wm/window_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "athena/screen/public/screen_manager.h" 9 #include "athena/screen/public/screen_manager.h"
10 #include "athena/util/container_priorities.h" 10 #include "athena/util/container_priorities.h"
(...skipping 30 matching lines...) Expand all
41 41
42 } // namespace 42 } // namespace
43 43
44 class AthenaContainerLayoutManager : public aura::LayoutManager { 44 class AthenaContainerLayoutManager : public aura::LayoutManager {
45 public: 45 public:
46 AthenaContainerLayoutManager(); 46 AthenaContainerLayoutManager();
47 virtual ~AthenaContainerLayoutManager(); 47 virtual ~AthenaContainerLayoutManager();
48 48
49 private: 49 private:
50 // aura::LayoutManager: 50 // aura::LayoutManager:
51 virtual void OnWindowResized() OVERRIDE; 51 virtual void OnWindowResized() override;
52 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; 52 virtual void OnWindowAddedToLayout(aura::Window* child) override;
53 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; 53 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override;
54 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; 54 virtual void OnWindowRemovedFromLayout(aura::Window* child) override;
55 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 55 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
56 bool visible) OVERRIDE; 56 bool visible) override;
57 virtual void SetChildBounds(aura::Window* child, 57 virtual void SetChildBounds(aura::Window* child,
58 const gfx::Rect& requested_bounds) OVERRIDE; 58 const gfx::Rect& requested_bounds) override;
59 59
60 DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager); 60 DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager);
61 }; 61 };
62 62
63 AthenaContainerLayoutManager::AthenaContainerLayoutManager() { 63 AthenaContainerLayoutManager::AthenaContainerLayoutManager() {
64 } 64 }
65 65
66 AthenaContainerLayoutManager::~AthenaContainerLayoutManager() { 66 AthenaContainerLayoutManager::~AthenaContainerLayoutManager() {
67 } 67 }
68 68
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 DCHECK(!instance); 425 DCHECK(!instance);
426 } 426 }
427 427
428 // static 428 // static
429 WindowManager* WindowManager::Get() { 429 WindowManager* WindowManager::Get() {
430 DCHECK(instance); 430 DCHECK(instance);
431 return instance; 431 return instance;
432 } 432 }
433 433
434 } // namespace athena 434 } // namespace athena
OLDNEW
« no previous file with comments | « athena/wm/window_manager_impl.h ('k') | athena/wm/window_overview_mode.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698