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

Side by Side 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: Made the ShelfView add/remove itself as an observer from the ShelfBackgroundAnimator. 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
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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 void RootWindowController::ShowShelf() { 488 void RootWindowController::ShowShelf() {
489 if (!shelf_widget_->shelf()) 489 if (!shelf_widget_->shelf())
490 return; 490 return;
491 shelf_widget_->shelf()->SetVisible(true); 491 shelf_widget_->shelf()->SetVisible(true);
492 shelf_widget_->status_area_widget()->Show(); 492 shelf_widget_->status_area_widget()->Show();
493 } 493 }
494 494
495 void RootWindowController::CreateShelf() { 495 void RootWindowController::CreateShelf() {
496 if (shelf_widget_->shelf()) 496 if (shelf_widget_->shelf())
497 return; 497 return;
498 shelf_widget_->CreateShelf(wm_shelf_aura_.get()); 498 shelf_widget_->CreateShelf();
499 499
500 if (panel_layout_manager_) 500 if (panel_layout_manager_)
501 panel_layout_manager_->SetShelf(wm_shelf_aura_.get()); 501 panel_layout_manager_->SetShelf(wm_shelf_aura_.get());
502 if (docked_layout_manager_) { 502 if (docked_layout_manager_) {
503 docked_layout_manager_->SetShelf(wm_shelf_aura_.get()); 503 docked_layout_manager_->SetShelf(wm_shelf_aura_.get());
504 if (shelf_widget_->shelf_layout_manager()) 504 if (shelf_widget_->shelf_layout_manager())
505 docked_layout_manager_->AddObserver( 505 docked_layout_manager_->AddObserver(
506 shelf_widget_->shelf_layout_manager()); 506 shelf_widget_->shelf_layout_manager());
507 } 507 }
508 508
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 aura::Window* primary_root_window = Shell::GetInstance() 977 aura::Window* primary_root_window = Shell::GetInstance()
978 ->window_tree_host_manager() 978 ->window_tree_host_manager()
979 ->GetPrimaryRootWindow(); 979 ->GetPrimaryRootWindow();
980 return GetRootWindowSettings(primary_root_window)->controller; 980 return GetRootWindowSettings(primary_root_window)->controller;
981 } 981 }
982 982
983 return GetRootWindowSettings(root_window)->controller; 983 return GetRootWindowSettings(root_window)->controller;
984 } 984 }
985 985
986 } // namespace ash 986 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698