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

Side by Side Diff: ash/root_window_controller.cc

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/root_window_controller.h ('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/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 docked_layout_manager_->AddObserver( 425 docked_layout_manager_->AddObserver(
426 shelf_widget_->shelf_layout_manager()); 426 shelf_widget_->shelf_layout_manager());
427 } 427 }
428 428
429 // Notify shell observers that the shelf has been created. 429 // Notify shell observers that the shelf has been created.
430 Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow()); 430 Shell::GetInstance()->OnShelfCreatedForRootWindow(GetRootWindow());
431 431
432 shelf_widget_->PostCreateShelf(); 432 shelf_widget_->PostCreateShelf();
433 } 433 }
434 434
435 Shelf* RootWindowController::GetShelf() const {
436 // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget.
437 return shelf_widget_->shelf();
438 }
439
435 void RootWindowController::UpdateAfterLoginStatusChange( 440 void RootWindowController::UpdateAfterLoginStatusChange(
436 user::LoginStatus status) { 441 user::LoginStatus status) {
437 if (status != user::LOGGED_IN_NONE) 442 if (status != user::LOGGED_IN_NONE)
438 mouse_event_target_.reset(); 443 mouse_event_target_.reset();
439 if (shelf_widget_->status_area_widget()) 444 if (shelf_widget_->status_area_widget())
440 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status); 445 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status);
441 } 446 }
442 447
443 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() { 448 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() {
444 #if defined(OS_CHROMEOS) 449 #if defined(OS_CHROMEOS)
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 aura::Window* primary_root_window = Shell::GetInstance() 1069 aura::Window* primary_root_window = Shell::GetInstance()
1065 ->window_tree_host_manager() 1070 ->window_tree_host_manager()
1066 ->GetPrimaryRootWindow(); 1071 ->GetPrimaryRootWindow();
1067 return GetRootWindowSettings(primary_root_window)->controller; 1072 return GetRootWindowSettings(primary_root_window)->controller;
1068 } 1073 }
1069 1074
1070 return GetRootWindowSettings(root_window)->controller; 1075 return GetRootWindowSettings(root_window)->controller;
1071 } 1076 }
1072 1077
1073 } // namespace ash 1078 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698