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

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

Issue 2047373002: Moves ShellObserver to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/aura/wm_root_window_controller_aura.h ('k') | ash/common/shell_observer.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 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 <set> 8 #include <set>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/aura/wm_lookup_aura.h" 11 #include "ash/aura/wm_lookup_aura.h"
12 #include "ash/common/shell_observer.h"
12 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
13 #include "ash/display/window_tree_host_manager.h" 14 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/shell_observer.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "ui/wm/public/activation_change_observer.h" 17 #include "ui/wm/public/activation_change_observer.h"
18 18
19 namespace ash { 19 namespace ash {
20 20
21 class ASH_EXPORT WmShellAura : public WmShell, 21 class ASH_EXPORT WmShellAura : public WmShell,
22 public aura::client::ActivationChangeObserver, 22 public aura::client::ActivationChangeObserver,
23 public WindowTreeHostManager::Observer, 23 public WindowTreeHostManager::Observer,
24 public ShellObserver { 24 public ShellObserver {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 base::ObserverList<WmDisplayObserver> display_observers_; 79 base::ObserverList<WmDisplayObserver> display_observers_;
80 80
81 base::ObserverList<WmOverviewModeObserver> overview_mode_observers_; 81 base::ObserverList<WmOverviewModeObserver> overview_mode_observers_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 83 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
84 }; 84 };
85 85
86 } // namespace ash 86 } // namespace ash
87 87
88 #endif // ASH_AURA_WM_SHELL_AURA_H_ 88 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/shell_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698