| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/system/overview/overview_button_tray.h" | 5 #include "ash/system/overview/overview_button_tray.h" |
| 6 | 6 |
| 7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shelf/shelf_types.h" | 9 #include "ash/shelf/shelf_types.h" |
| 10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 namespace ash { | 22 namespace ash { |
| 23 | 23 |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 OverviewButtonTray* GetTray() { | 26 OverviewButtonTray* GetTray() { |
| 27 return Shell::GetPrimaryRootWindowController()->shelf()-> | 27 return Shell::GetPrimaryRootWindowController()->shelf()-> |
| 28 status_area_widget()->overview_button_tray(); | 28 status_area_widget()->overview_button_tray(); |
| 29 } | 29 } |
| 30 | 30 |
| 31 OverviewButtonTray* GetSecondaryTray() { | 31 OverviewButtonTray* GetSecondaryTray() { |
| 32 internal::RootWindowController* primary_controller = | 32 RootWindowController* primary_controller = |
| 33 Shell::GetPrimaryRootWindowController(); | 33 Shell::GetPrimaryRootWindowController(); |
| 34 Shell::RootWindowControllerList controllers = | 34 Shell::RootWindowControllerList controllers = |
| 35 Shell::GetAllRootWindowControllers(); | 35 Shell::GetAllRootWindowControllers(); |
| 36 for (size_t i = 0; i < controllers.size(); ++i) { | 36 for (size_t i = 0; i < controllers.size(); ++i) { |
| 37 if (controllers[i] != primary_controller) { | 37 if (controllers[i] != primary_controller) { |
| 38 return controllers[i]->shelf()-> | 38 return controllers[i]->shelf()-> |
| 39 status_area_widget()->overview_button_tray(); | 39 status_area_widget()->overview_button_tray(); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_NONE); | 127 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_NONE); |
| 128 EXPECT_FALSE(GetTray()->visible()); | 128 EXPECT_FALSE(GetTray()->visible()); |
| 129 SetUserLoggedIn(true); | 129 SetUserLoggedIn(true); |
| 130 SetSessionStarted(true); | 130 SetSessionStarted(true); |
| 131 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER); | 131 Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER); |
| 132 EXPECT_TRUE(GetTray()->visible()); | 132 EXPECT_TRUE(GetTray()->visible()); |
| 133 Shell::GetInstance()->EnableMaximizeModeWindowManager(false); | 133 Shell::GetInstance()->EnableMaximizeModeWindowManager(false); |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace ash | 136 } // namespace ash |
| OLD | NEW |