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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller.cc

Issue 2191153002: Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/shelf/shelf.h » ('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 69a263c851595be87845006ff32814697c578338..5e1931688c206cab0594f50177b2070f0171780f 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -496,7 +496,7 @@
void RootWindowController::CreateShelf() {
if (shelf_widget_->shelf())
return;
- shelf_widget_->CreateShelf();
+ shelf_widget_->CreateShelf(wm_shelf_aura_.get());
if (panel_layout_manager_)
panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
« no previous file with comments | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698