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

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

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 unified diff | Download patch
« no previous file with comments | « athena/wm/window_manager_impl.h ('k') | athena/wm/window_manager_unittest.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 27 matching lines...) Expand all
38 const gfx::Transform& transform) { 38 const gfx::Transform& transform) {
39 window->SetBounds(bounds); 39 window->SetBounds(bounds);
40 window->SetTransform(transform); 40 window->SetTransform(transform);
41 } 41 }
42 42
43 } // namespace 43 } // namespace
44 44
45 class AthenaContainerLayoutManager : public aura::LayoutManager { 45 class AthenaContainerLayoutManager : public aura::LayoutManager {
46 public: 46 public:
47 AthenaContainerLayoutManager(); 47 AthenaContainerLayoutManager();
48 virtual ~AthenaContainerLayoutManager(); 48 ~AthenaContainerLayoutManager() override;
49 49
50 private: 50 private:
51 // aura::LayoutManager: 51 // aura::LayoutManager:
52 virtual void OnWindowResized() override; 52 void OnWindowResized() override;
53 virtual void OnWindowAddedToLayout(aura::Window* child) override; 53 void OnWindowAddedToLayout(aura::Window* child) override;
54 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override; 54 void OnWillRemoveWindowFromLayout(aura::Window* child) override;
55 virtual void OnWindowRemovedFromLayout(aura::Window* child) override; 55 void OnWindowRemovedFromLayout(aura::Window* child) override;
56 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 56 void OnChildWindowVisibilityChanged(aura::Window* child,
57 bool visible) override; 57 bool visible) override;
58 virtual void SetChildBounds(aura::Window* child, 58 void SetChildBounds(aura::Window* child,
59 const gfx::Rect& requested_bounds) override; 59 const gfx::Rect& requested_bounds) override;
60 60
61 DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager); 61 DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager);
62 }; 62 };
63 63
64 AthenaContainerLayoutManager::AthenaContainerLayoutManager() { 64 AthenaContainerLayoutManager::AthenaContainerLayoutManager() {
65 } 65 }
66 66
67 AthenaContainerLayoutManager::~AthenaContainerLayoutManager() { 67 AthenaContainerLayoutManager::~AthenaContainerLayoutManager() {
68 } 68 }
69 69
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 DCHECK(!instance); 457 DCHECK(!instance);
458 } 458 }
459 459
460 // static 460 // static
461 WindowManager* WindowManager::Get() { 461 WindowManager* WindowManager::Get() {
462 DCHECK(instance); 462 DCHECK(instance);
463 return instance; 463 return instance;
464 } 464 }
465 465
466 } // namespace athena 466 } // namespace athena
OLDNEW
« no previous file with comments | « athena/wm/window_manager_impl.h ('k') | athena/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698