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

Side by Side Diff: ash/wm/stacking_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/wm/session_state_animator_impl.cc ('k') | ash/wm/status_area_layout_manager.h » ('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_STACKING_CONTROLLER_H_ 5 #ifndef ASH_WM_STACKING_CONTROLLER_H_
6 #define ASH_WM_STACKING_CONTROLLER_H_ 6 #define ASH_WM_STACKING_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura/client/window_tree_client.h" 12 #include "ui/aura/client/window_tree_client.h"
13 13
14 namespace ash { 14 namespace ash {
15 class AlwaysOnTopController; 15 class AlwaysOnTopController;
16 16
17 class ASH_EXPORT StackingController : public aura::client::WindowTreeClient { 17 class ASH_EXPORT StackingController : public aura::client::WindowTreeClient {
18 public: 18 public:
19 StackingController(); 19 StackingController();
20 virtual ~StackingController(); 20 virtual ~StackingController();
21 21
22 // Overridden from aura::client::WindowTreeClient: 22 // Overridden from aura::client::WindowTreeClient:
23 virtual aura::Window* GetDefaultParent(aura::Window* context, 23 virtual aura::Window* GetDefaultParent(aura::Window* context,
24 aura::Window* window, 24 aura::Window* window,
25 const gfx::Rect& bounds) OVERRIDE; 25 const gfx::Rect& bounds) override;
26 26
27 private: 27 private:
28 // Returns corresponding system modal container for a modal window. 28 // Returns corresponding system modal container for a modal window.
29 // If screen lock is not active, all system modal windows are placed into the 29 // If screen lock is not active, all system modal windows are placed into the
30 // normal modal container. 30 // normal modal container.
31 // Otherwise those that originate from LockScreen container and above are 31 // Otherwise those that originate from LockScreen container and above are
32 // placed in the screen lock modal container. 32 // placed in the screen lock modal container.
33 aura::Window* GetSystemModalContainer(aura::Window* root, 33 aura::Window* GetSystemModalContainer(aura::Window* root,
34 aura::Window* window) const; 34 aura::Window* window) const;
35 35
36 DISALLOW_COPY_AND_ASSIGN(StackingController); 36 DISALLOW_COPY_AND_ASSIGN(StackingController);
37 }; 37 };
38 38
39 } // namespace ash 39 } // namespace ash
40 40
41 #endif // ASH_WM_STACKING_CONTROLLER_H_ 41 #endif // ASH_WM_STACKING_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/wm/session_state_animator_impl.cc ('k') | ash/wm/status_area_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698