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

Side by Side Diff: ash/wm/window_state.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/wm/window_state.h ('k') | ash/wm/window_state_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/wm/window_state.h" 5 #include "ash/wm/window_state.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // A tentative class to set the bounds on the window. 35 // A tentative class to set the bounds on the window.
36 // TODO(oshima): Once all logic is cleaned up, move this to the real layout 36 // TODO(oshima): Once all logic is cleaned up, move this to the real layout
37 // manager with proper friendship. 37 // manager with proper friendship.
38 class BoundsSetter : public aura::LayoutManager { 38 class BoundsSetter : public aura::LayoutManager {
39 public: 39 public:
40 BoundsSetter() {} 40 BoundsSetter() {}
41 virtual ~BoundsSetter() {} 41 virtual ~BoundsSetter() {}
42 42
43 // aura::LayoutManager overrides: 43 // aura::LayoutManager overrides:
44 virtual void OnWindowResized() OVERRIDE {} 44 virtual void OnWindowResized() override {}
45 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {} 45 virtual void OnWindowAddedToLayout(aura::Window* child) override {}
46 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {} 46 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
47 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {} 47 virtual void OnWindowRemovedFromLayout(aura::Window* child) override {}
48 virtual void OnChildWindowVisibilityChanged( 48 virtual void OnChildWindowVisibilityChanged(
49 aura::Window* child, bool visible) OVERRIDE {} 49 aura::Window* child, bool visible) override {}
50 virtual void SetChildBounds( 50 virtual void SetChildBounds(
51 aura::Window* child, const gfx::Rect& requested_bounds) OVERRIDE {} 51 aura::Window* child, const gfx::Rect& requested_bounds) override {}
52 52
53 void SetBounds(aura::Window* window, const gfx::Rect& bounds) { 53 void SetBounds(aura::Window* window, const gfx::Rect& bounds) {
54 SetChildBoundsDirect(window, bounds); 54 SetChildBoundsDirect(window, bounds);
55 } 55 }
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN(BoundsSetter); 58 DISALLOW_COPY_AND_ASSIGN(BoundsSetter);
59 }; 59 };
60 60
61 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { 61 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) {
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 } 458 }
459 return settings; 459 return settings;
460 } 460 }
461 461
462 const WindowState* GetWindowState(const aura::Window* window) { 462 const WindowState* GetWindowState(const aura::Window* window) {
463 return GetWindowState(const_cast<aura::Window*>(window)); 463 return GetWindowState(const_cast<aura::Window*>(window));
464 } 464 }
465 465
466 } // namespace wm 466 } // namespace wm
467 } // namespace ash 467 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_state.h ('k') | ash/wm/window_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698