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

Side by Side 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, 4 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 void RootWindowController::ShowShelf() { 489 void RootWindowController::ShowShelf() {
490 if (!shelf_widget_->shelf()) 490 if (!shelf_widget_->shelf())
491 return; 491 return;
492 shelf_widget_->shelf()->SetVisible(true); 492 shelf_widget_->shelf()->SetVisible(true);
493 shelf_widget_->status_area_widget()->Show(); 493 shelf_widget_->status_area_widget()->Show();
494 } 494 }
495 495
496 void RootWindowController::CreateShelf() { 496 void RootWindowController::CreateShelf() {
497 if (shelf_widget_->shelf()) 497 if (shelf_widget_->shelf())
498 return; 498 return;
499 shelf_widget_->CreateShelf(); 499 shelf_widget_->CreateShelf(wm_shelf_aura_.get());
500 500
501 if (panel_layout_manager_) 501 if (panel_layout_manager_)
502 panel_layout_manager_->SetShelf(wm_shelf_aura_.get()); 502 panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
503 if (docked_layout_manager_) { 503 if (docked_layout_manager_) {
504 docked_layout_manager_->SetShelf(wm_shelf_aura_.get()); 504 docked_layout_manager_->SetShelf(wm_shelf_aura_.get());
505 if (shelf_widget_->shelf_layout_manager()) 505 if (shelf_widget_->shelf_layout_manager())
506 docked_layout_manager_->AddObserver( 506 docked_layout_manager_->AddObserver(
507 shelf_widget_->shelf_layout_manager()); 507 shelf_widget_->shelf_layout_manager());
508 } 508 }
509 509
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 aura::Window* primary_root_window = Shell::GetInstance() 978 aura::Window* primary_root_window = Shell::GetInstance()
979 ->window_tree_host_manager() 979 ->window_tree_host_manager()
980 ->GetPrimaryRootWindow(); 980 ->GetPrimaryRootWindow();
981 return GetRootWindowSettings(primary_root_window)->controller; 981 return GetRootWindowSettings(primary_root_window)->controller;
982 } 982 }
983 983
984 return GetRootWindowSettings(root_window)->controller; 984 return GetRootWindowSettings(root_window)->controller;
985 } 985 }
986 986
987 } // namespace ash 987 } // namespace ash
OLDNEW
« 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