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

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

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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/ash.gyp ('k') | ash/aura/wm_shell_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_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/aura/wm_lookup_aura.h" 9 #include "ash/aura/wm_lookup_aura.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
11 #include "ash/display/window_tree_host_manager.h" 11 #include "ash/display/window_tree_host_manager.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "ui/wm/public/activation_change_observer.h" 14 #include "ui/wm/public/activation_change_observer.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 class ASH_EXPORT WmShellAura : public WmShell, 18 class ASH_EXPORT WmShellAura : public WmShell,
19 public aura::client::ActivationChangeObserver, 19 public aura::client::ActivationChangeObserver,
20 public WindowTreeHostManager::Observer { 20 public WindowTreeHostManager::Observer {
21 public: 21 public:
22 WmShellAura(); 22 explicit WmShellAura(ShellDelegate* delegate);
23 ~WmShellAura() override; 23 ~WmShellAura() override;
24 24
25 static WmShellAura* Get(); 25 static WmShellAura* Get();
26 26
27 // Called early in shutdown sequence. 27 // Called early in shutdown sequence.
28 void PrepareForShutdown(); 28 void PrepareForShutdown();
29 29
30 // WmShell: 30 // WmShell:
31 WmWindow* NewContainerWindow() override; 31 WmWindow* NewContainerWindow() override;
32 WmWindow* GetFocusedWindow() override; 32 WmWindow* GetFocusedWindow() override;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 bool added_display_observer_ = false; 84 bool added_display_observer_ = false;
85 base::ObserverList<WmDisplayObserver> display_observers_; 85 base::ObserverList<WmDisplayObserver> display_observers_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 87 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
88 }; 88 };
89 89
90 } // namespace ash 90 } // namespace ash
91 91
92 #endif // ASH_AURA_WM_SHELL_AURA_H_ 92 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698