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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: feedback Created 3 years, 7 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/root_window_controller.cc ('k') | ash/wm/always_on_top_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index f2148e07ca03fc9a4c2e845d2a224b36933e42ac..0d27fb1a19ac12b0fdfd1b49832ddbdc67acbe8e 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -1039,10 +1039,10 @@ float ShelfLayoutManager::ComputeTargetOpacity(const State& state) {
}
bool ShelfLayoutManager::IsShelfHiddenForFullscreen() const {
- const WmWindow* fullscreen_window = wm::GetWindowForFullscreenMode(
- WmWindow::Get(shelf_widget_->GetNativeWindow()));
+ const aura::Window* fullscreen_window =
+ wm::GetWindowForFullscreenMode(shelf_widget_->GetNativeWindow());
return fullscreen_window &&
- fullscreen_window->GetWindowState()->hide_shelf_when_fullscreen();
+ wm::GetWindowState(fullscreen_window)->hide_shelf_when_fullscreen();
}
bool ShelfLayoutManager::IsShelfAutoHideForFullscreenMaximized() const {
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/wm/always_on_top_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698