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

Side by Side Diff: ash/root_window_controller.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/popup_message.cc ('k') | ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 // types in the shell UI. 260 // types in the shell UI.
261 void CreateContainersInRootWindow(aura::Window* root_window); 261 void CreateContainersInRootWindow(aura::Window* root_window);
262 262
263 // Enables projection touch HUD. 263 // Enables projection touch HUD.
264 void EnableTouchHudProjection(); 264 void EnableTouchHudProjection();
265 265
266 // Disables projection touch HUD. 266 // Disables projection touch HUD.
267 void DisableTouchHudProjection(); 267 void DisableTouchHudProjection();
268 268
269 // Overridden from ShellObserver. 269 // Overridden from ShellObserver.
270 virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; 270 virtual void OnLoginStateChanged(user::LoginStatus status) override;
271 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; 271 virtual void OnTouchHudProjectionToggled(bool enabled) override;
272 272
273 scoped_ptr<AshWindowTreeHost> ash_host_; 273 scoped_ptr<AshWindowTreeHost> ash_host_;
274 RootWindowLayoutManager* root_window_layout_; 274 RootWindowLayoutManager* root_window_layout_;
275 275
276 scoped_ptr<StackingController> stacking_controller_; 276 scoped_ptr<StackingController> stacking_controller_;
277 277
278 // The shelf for managing the shelf and the status widget. 278 // The shelf for managing the shelf and the status widget.
279 scoped_ptr<ShelfWidget> shelf_; 279 scoped_ptr<ShelfWidget> shelf_;
280 280
281 // An invisible/empty window used as a event target for 281 // An invisible/empty window used as a event target for
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 }; 320 };
321 321
322 322
323 // Gets the RootWindowController for |root_window|. 323 // Gets the RootWindowController for |root_window|.
324 ASH_EXPORT RootWindowController* GetRootWindowController( 324 ASH_EXPORT RootWindowController* GetRootWindowController(
325 const aura::Window* root_window); 325 const aura::Window* root_window);
326 326
327 } // namespace ash 327 } // namespace ash
328 328
329 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 329 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/popup_message.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698