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

Side by Side Diff: ash/root_window_controller.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test 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/root_window_controller_unittest.cc » ('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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 WmWindowAura::Get(GetRootWindow())); 419 WmWindowAura::Get(GetRootWindow()));
420 420
421 shelf_widget_->PostCreateShelf(); 421 shelf_widget_->PostCreateShelf();
422 } 422 }
423 423
424 Shelf* RootWindowController::GetShelf() const { 424 Shelf* RootWindowController::GetShelf() const {
425 // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget. 425 // TODO(jamescook): Shelf should be owned by this class, not by ShelfWidget.
426 return shelf_widget_->shelf(); 426 return shelf_widget_->shelf();
427 } 427 }
428 428
429 void RootWindowController::UpdateAfterLoginStatusChange( 429 void RootWindowController::UpdateAfterLoginStatusChange(LoginStatus status) {
430 user::LoginStatus status) { 430 if (status != LoginStatus::NOT_LOGGED_IN)
431 if (status != user::LOGGED_IN_NONE)
432 mouse_event_target_.reset(); 431 mouse_event_target_.reset();
433 if (shelf_widget_->status_area_widget()) 432 if (shelf_widget_->status_area_widget())
434 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status); 433 shelf_widget_->status_area_widget()->UpdateAfterLoginStatusChange(status);
435 } 434 }
436 435
437 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() { 436 void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() {
438 #if defined(OS_CHROMEOS) 437 #if defined(OS_CHROMEOS)
439 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 438 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
440 switches::kAshAnimateFromBootSplashScreen) && 439 switches::kAshAnimateFromBootSplashScreen) &&
441 boot_splash_screen_.get()) { 440 boot_splash_screen_.get()) {
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 touch_hud_projection_->Remove(); 855 touch_hud_projection_->Remove();
857 } 856 }
858 857
859 void RootWindowController::OnMenuClosed() { 858 void RootWindowController::OnMenuClosed() {
860 menu_runner_.reset(); 859 menu_runner_.reset();
861 menu_model_adapter_.reset(); 860 menu_model_adapter_.reset();
862 menu_model_.reset(); 861 menu_model_.reset();
863 Shell::GetInstance()->UpdateShelfVisibility(); 862 Shell::GetInstance()->UpdateShelfVisibility();
864 } 863 }
865 864
866 void RootWindowController::OnLoginStateChanged(user::LoginStatus status) { 865 void RootWindowController::OnLoginStateChanged(LoginStatus status) {
867 shelf_widget_->shelf_layout_manager()->UpdateVisibilityState(); 866 shelf_widget_->shelf_layout_manager()->UpdateVisibilityState();
868 } 867 }
869 868
870 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) { 869 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
871 if (enabled) 870 if (enabled)
872 EnableTouchHudProjection(); 871 EnableTouchHudProjection();
873 else 872 else
874 DisableTouchHudProjection(); 873 DisableTouchHudProjection();
875 } 874 }
876 875
(...skipping 11 matching lines...) Expand all
888 aura::Window* primary_root_window = Shell::GetInstance() 887 aura::Window* primary_root_window = Shell::GetInstance()
889 ->window_tree_host_manager() 888 ->window_tree_host_manager()
890 ->GetPrimaryRootWindow(); 889 ->GetPrimaryRootWindow();
891 return GetRootWindowSettings(primary_root_window)->controller; 890 return GetRootWindowSettings(primary_root_window)->controller;
892 } 891 }
893 892
894 return GetRootWindowSettings(root_window)->controller; 893 return GetRootWindowSettings(root_window)->controller;
895 } 894 }
896 895
897 } // namespace ash 896 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698