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

Unified Diff: ash/root_window_controller.cc

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/high_contrast/high_contrast_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index b79eb6f4198bcc11a30ee283526545f0540f3f9f..befce2c865762fa8c55e2ba531b144a2bc1268ac 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -250,8 +250,8 @@ class WorkspaceLayoutManagerDelegateImpl
}
void OnFullscreenStateChanged(bool is_fullscreen) override {
if (shelf_) {
- ash::Shell::GetInstance()->NotifyFullscreenStateChange(is_fullscreen,
- root_window_);
+ ash::Shell::GetInstance()->NotifyFullscreenStateChange(
+ is_fullscreen, WmWindowAura::Get(root_window_));
}
}
@@ -415,7 +415,8 @@ void RootWindowController::CreateShelf() {
}
// Notify shell observers that the shelf has been created.
- Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow());
+ Shell::GetInstance()->OnShelfCreatedForRootWindow(
+ WmWindowAura::Get(GetRootWindow()));
shelf_widget_->PostCreateShelf();
}
@@ -711,7 +712,7 @@ void RootWindowController::Init(RootWindowType root_window_type,
CreateShelf();
// Notify shell observers about new root window.
- shell->OnRootWindowAdded(root_window);
+ shell->OnRootWindowAdded(WmWindowAura::Get(root_window));
}
#if defined(OS_CHROMEOS)
« no previous file with comments | « ash/high_contrast/high_contrast_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698