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

Side by Side Diff: ash/aura/wm_root_window_controller_aura.h

Issue 2623703002: Removes WmRootWindowController::GetShell() (Closed)
Patch Set: not relative Created 3 years, 11 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 | « no previous file | ash/aura/wm_root_window_controller_aura.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_AURA_WM_ROOT_CONTROLLER_AURA_H_ 5 #ifndef ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
6 #define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_ 6 #define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm_root_window_controller.h" 9 #include "ash/common/wm_root_window_controller.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 13 matching lines...) Expand all
24 ~WmRootWindowControllerAura() override; 24 ~WmRootWindowControllerAura() override;
25 25
26 static WmRootWindowControllerAura* Get(aura::Window* window) { 26 static WmRootWindowControllerAura* Get(aura::Window* window) {
27 return const_cast<WmRootWindowControllerAura*>( 27 return const_cast<WmRootWindowControllerAura*>(
28 Get(const_cast<const aura::Window*>(window))); 28 Get(const_cast<const aura::Window*>(window)));
29 } 29 }
30 static const WmRootWindowControllerAura* Get(const aura::Window* window); 30 static const WmRootWindowControllerAura* Get(const aura::Window* window);
31 31
32 // WmRootWindowController: 32 // WmRootWindowController:
33 bool HasShelf() override; 33 bool HasShelf() override;
34 WmShell* GetShell() override;
35 WmShelf* GetShelf() override; 34 WmShelf* GetShelf() override;
36 WmWindow* GetWindow() override; 35 WmWindow* GetWindow() override;
37 void OnInitialWallpaperAnimationStarted() override; 36 void OnInitialWallpaperAnimationStarted() override;
38 void OnWallpaperAnimationFinished(views::Widget* widget) override; 37 void OnWallpaperAnimationFinished(views::Widget* widget) override;
39 38
40 protected: 39 protected:
41 // WmRootWindowController: 40 // WmRootWindowController:
42 bool ShouldDestroyWindowInCloseChildWindows(WmWindow* window) override; 41 bool ShouldDestroyWindowInCloseChildWindows(WmWindow* window) override;
43 42
44 private: 43 private:
45 friend class RootWindowController; 44 friend class RootWindowController;
46 45
47 RootWindowController* root_window_controller_; 46 RootWindowController* root_window_controller_;
48 47
49 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura); 48 DISALLOW_COPY_AND_ASSIGN(WmRootWindowControllerAura);
50 }; 49 };
51 50
52 } // namespace ash 51 } // namespace ash
53 52
54 #endif // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_ 53 #endif // ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698