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

Unified Diff: ash/shell.h

Issue 2041423003: Converts ShellObserver from aura::Window to ash::WmWindow (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 5816ff1276be39a041aaba325afd827878c8dd48..f0754e412806a1d08029831d2abe04c064256e18 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -163,6 +163,7 @@ class WindowCycleController;
class WindowPositioner;
class WindowSelectorController;
class WmShellAura;
+class WmWindow;
namespace shell {
class WindowWatcher;
@@ -320,13 +321,13 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
void OnMaximizeModeEnded();
// Called when a root window is created.
- void OnRootWindowAdded(aura::Window* root_window);
+ void OnRootWindowAdded(WmWindow* root_window);
// Initializes |shelf_|. Does nothing if it's already initialized.
void CreateShelf();
// Called when the shelf is created for |root_window|.
- void OnShelfCreatedForRootWindow(aura::Window* root_window);
+ void OnShelfCreatedForRootWindow(WmWindow* root_window);
// Creates a virtual keyboard. Deletes the old virtual keyboard if it already
// exists.
@@ -477,16 +478,15 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// Called when the alignment for a shelf changes.
// TODO(jamescook): Move to Shelf.
- void OnShelfAlignmentChanged(aura::Window* root_window);
+ void OnShelfAlignmentChanged(WmWindow* root_window);
// Called when the auto-hide behavior for a shelf changes.
// TODO(jamescook): Move to Shelf.
- void OnShelfAutoHideBehaviorChanged(aura::Window* root_window);
+ void OnShelfAutoHideBehaviorChanged(WmWindow* root_window);
// Notifies |observers_| when entering or exiting fullscreen mode in
// |root_window|.
- void NotifyFullscreenStateChange(bool is_fullscreen,
- aura::Window* root_window);
+ void NotifyFullscreenStateChange(bool is_fullscreen, WmWindow* root_window);
// Creates a modal background (a partially-opaque fullscreen window)
// on all displays for |window|.
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698