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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/workspace_controller.cc

Issue 2889673002: chromeos: Refactor shelf to create ShelfView earlier in startup (Closed)
Patch Set: rebase 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
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/wm/workspace/workspace_layout_manager.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 65de23f04633df8dbb245631af3ab83292a82bac..6dacb989affe053a51241e5e0d2497911109d6f3 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -53,7 +53,7 @@ WorkspaceController::~WorkspaceController() {
}
wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
- if (!viewport_ || !RootWindowController::ForWindow(viewport_)->HasShelf())
+ if (!viewport_)
return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
const aura::Window* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/wm/workspace/workspace_layout_manager.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698