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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller.cc

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added PaletteTray to the Shelf background animations. 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
« ash/common/system/tray/tray_background_view.cc ('K') | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/shelf/shelf.h » ('j') | ash/shelf/shelf.h » ('J')
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 fb60b3496544c2ecc501085b06b6dc6c089fbce6..eb6f967853120b76b7e4c94412e376db8676c07b 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -495,7 +495,7 @@ void RootWindowController::ShowShelf() {
void RootWindowController::CreateShelf() {
if (shelf_widget_->shelf())
return;
- shelf_widget_->CreateShelf(wm_shelf_aura_.get());
+ shelf_widget_->CreateShelf();
if (panel_layout_manager_)
panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
« ash/common/system/tray/tray_background_view.cc ('K') | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/shelf/shelf.h » ('j') | ash/shelf/shelf.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698