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

Side by Side Diff: ash/wm/panels/panel_layout_manager.h

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/panels/panel_frame_view.h ('k') | ash/wm/panels/panel_layout_manager.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 5 #ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 6 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // Hide / Show the panel callout widgets. 75 // Hide / Show the panel callout widgets.
76 void SetShowCalloutWidgets(bool show); 76 void SetShowCalloutWidgets(bool show);
77 77
78 // Returns the callout widget (arrow) for |panel|. 78 // Returns the callout widget (arrow) for |panel|.
79 views::Widget* GetCalloutWidgetForPanel(aura::Window* panel); 79 views::Widget* GetCalloutWidgetForPanel(aura::Window* panel);
80 80
81 Shelf* shelf() { return shelf_; } 81 Shelf* shelf() { return shelf_; }
82 void SetShelf(Shelf* shelf); 82 void SetShelf(Shelf* shelf);
83 83
84 // Overridden from aura::LayoutManager: 84 // Overridden from aura::LayoutManager:
85 virtual void OnWindowResized() OVERRIDE; 85 virtual void OnWindowResized() override;
86 virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE; 86 virtual void OnWindowAddedToLayout(aura::Window* child) override;
87 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE; 87 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override;
88 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE; 88 virtual void OnWindowRemovedFromLayout(aura::Window* child) override;
89 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 89 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
90 bool visibile) OVERRIDE; 90 bool visibile) override;
91 virtual void SetChildBounds(aura::Window* child, 91 virtual void SetChildBounds(aura::Window* child,
92 const gfx::Rect& requested_bounds) OVERRIDE; 92 const gfx::Rect& requested_bounds) override;
93 93
94 // Overridden from ShelfIconObserver 94 // Overridden from ShelfIconObserver
95 virtual void OnShelfIconPositionsChanged() OVERRIDE; 95 virtual void OnShelfIconPositionsChanged() override;
96 96
97 // Overridden from ShellObserver 97 // Overridden from ShellObserver
98 virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE; 98 virtual void OnShelfAlignmentChanged(aura::Window* root_window) override;
99 99
100 // Overridden from aura::WindowObserver 100 // Overridden from aura::WindowObserver
101 virtual void OnWindowPropertyChanged(aura::Window* window, 101 virtual void OnWindowPropertyChanged(aura::Window* window,
102 const void* key, 102 const void* key,
103 intptr_t old) OVERRIDE; 103 intptr_t old) override;
104 104
105 // Overridden from ash::wm::WindowStateObserver 105 // Overridden from ash::wm::WindowStateObserver
106 virtual void OnPostWindowStateTypeChange( 106 virtual void OnPostWindowStateTypeChange(
107 wm::WindowState* window_state, 107 wm::WindowState* window_state,
108 wm::WindowStateType old_type) OVERRIDE; 108 wm::WindowStateType old_type) override;
109 109
110 // Overridden from aura::client::ActivationChangeObserver 110 // Overridden from aura::client::ActivationChangeObserver
111 virtual void OnWindowActivated(aura::Window* gained_active, 111 virtual void OnWindowActivated(aura::Window* gained_active,
112 aura::Window* lost_active) OVERRIDE; 112 aura::Window* lost_active) override;
113 113
114 // Overridden from DisplayController::Observer 114 // Overridden from DisplayController::Observer
115 virtual void OnDisplayConfigurationChanged() OVERRIDE; 115 virtual void OnDisplayConfigurationChanged() override;
116 116
117 // Overridden from ShelfLayoutManagerObserver 117 // Overridden from ShelfLayoutManagerObserver
118 virtual void WillChangeVisibilityState( 118 virtual void WillChangeVisibilityState(
119 ShelfVisibilityState new_state) OVERRIDE; 119 ShelfVisibilityState new_state) override;
120 120
121 private: 121 private:
122 friend class PanelLayoutManagerTest; 122 friend class PanelLayoutManagerTest;
123 friend class PanelWindowResizerTest; 123 friend class PanelWindowResizerTest;
124 friend class DockedWindowResizerTest; 124 friend class DockedWindowResizerTest;
125 friend class DockedWindowLayoutManagerTest; 125 friend class DockedWindowLayoutManagerTest;
126 friend class WorkspaceControllerTest; 126 friend class WorkspaceControllerTest;
127 127
128 views::Widget* CreateCalloutWidget(); 128 views::Widget* CreateCalloutWidget();
129 129
(...skipping 27 matching lines...) Expand all
157 157
158 // Called whenever the panel stacking order needs to be updated (e.g. focus 158 // Called whenever the panel stacking order needs to be updated (e.g. focus
159 // changes or a panel is moved). 159 // changes or a panel is moved).
160 void UpdateStacking(aura::Window* active_panel); 160 void UpdateStacking(aura::Window* active_panel);
161 161
162 // Update the callout arrows for all managed panels. 162 // Update the callout arrows for all managed panels.
163 void UpdateCallouts(); 163 void UpdateCallouts();
164 164
165 // Overridden from keyboard::KeyboardControllerObserver: 165 // Overridden from keyboard::KeyboardControllerObserver:
166 virtual void OnKeyboardBoundsChanging( 166 virtual void OnKeyboardBoundsChanging(
167 const gfx::Rect& keyboard_bounds) OVERRIDE; 167 const gfx::Rect& keyboard_bounds) override;
168 168
169 // Parent window associated with this layout manager. 169 // Parent window associated with this layout manager.
170 aura::Window* panel_container_; 170 aura::Window* panel_container_;
171 // Protect against recursive calls to OnWindowAddedToLayout(). 171 // Protect against recursive calls to OnWindowAddedToLayout().
172 bool in_add_window_; 172 bool in_add_window_;
173 // Protect against recursive calls to Relayout(). 173 // Protect against recursive calls to Relayout().
174 bool in_layout_; 174 bool in_layout_;
175 // Indicates if the panel callout widget should be created. 175 // Indicates if the panel callout widget should be created.
176 bool show_callout_widgets_; 176 bool show_callout_widgets_;
177 // Ordered list of unowned pointers to panel windows. 177 // Ordered list of unowned pointers to panel windows.
(...skipping 14 matching lines...) Expand all
192 // are currently focused. 192 // are currently focused.
193 aura::Window* last_active_panel_; 193 aura::Window* last_active_panel_;
194 base::WeakPtrFactory<PanelLayoutManager> weak_factory_; 194 base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
195 195
196 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager); 196 DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
197 }; 197 };
198 198
199 } // namespace ash 199 } // namespace ash
200 200
201 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ 201 #endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/panels/panel_frame_view.h ('k') | ash/wm/panels/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698