Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/accelerators/accelerator_controller.h" | 10 #include "ash/accelerators/accelerator_controller.h" |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 478 void Shell::AddShellObserver(ShellObserver* observer) { | 478 void Shell::AddShellObserver(ShellObserver* observer) { |
| 479 observers_.AddObserver(observer); | 479 observers_.AddObserver(observer); |
| 480 } | 480 } |
| 481 | 481 |
| 482 void Shell::RemoveShellObserver(ShellObserver* observer) { | 482 void Shell::RemoveShellObserver(ShellObserver* observer) { |
| 483 observers_.RemoveObserver(observer); | 483 observers_.RemoveObserver(observer); |
| 484 } | 484 } |
| 485 | 485 |
| 486 #if defined(OS_CHROMEOS) | 486 #if defined(OS_CHROMEOS) |
| 487 bool Shell::ShouldSaveDisplaySettings() { | 487 bool Shell::ShouldSaveDisplaySettings() { |
| 488 return !((maximize_mode_controller_->IsMaximizeModeWindowManagerEnabled() && | 488 return !((maximize_mode_controller_->IsMaximizeModeWindowManagerEnabled() && |
|
flackr
2014/11/27 15:39:15
Do we need to check if maximize mode window manage
jonross
2014/12/10 17:57:30
Yeah the maximize mode check is no longer needed
| |
| 489 maximize_mode_controller_-> | 489 screen_orientation_delegate_ |
| 490 ignore_display_configuration_updates()) || | 490 ->ignore_display_configuration_updates()) || |
| 491 resolution_notification_controller_->DoesNotificationTimeout()); | 491 resolution_notification_controller_->DoesNotificationTimeout()); |
| 492 } | 492 } |
| 493 #endif | 493 #endif |
| 494 | 494 |
| 495 void Shell::UpdateShelfVisibility() { | 495 void Shell::UpdateShelfVisibility() { |
| 496 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 496 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
| 497 for (RootWindowControllerList::iterator iter = controllers.begin(); | 497 for (RootWindowControllerList::iterator iter = controllers.begin(); |
| 498 iter != controllers.end(); ++iter) | 498 iter != controllers.end(); ++iter) |
| 499 if ((*iter)->shelf()) | 499 if ((*iter)->shelf()) |
| 500 (*iter)->UpdateShelfVisibility(); | 500 (*iter)->UpdateShelfVisibility(); |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1159 //////////////////////////////////////////////////////////////////////////////// | 1159 //////////////////////////////////////////////////////////////////////////////// |
| 1160 // Shell, aura::client::ActivationChangeObserver implementation: | 1160 // Shell, aura::client::ActivationChangeObserver implementation: |
| 1161 | 1161 |
| 1162 void Shell::OnWindowActivated(aura::Window* gained_active, | 1162 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 1163 aura::Window* lost_active) { | 1163 aura::Window* lost_active) { |
| 1164 if (gained_active) | 1164 if (gained_active) |
| 1165 target_root_window_ = gained_active->GetRootWindow(); | 1165 target_root_window_ = gained_active->GetRootWindow(); |
| 1166 } | 1166 } |
| 1167 | 1167 |
| 1168 } // namespace ash | 1168 } // namespace ash |
| OLD | NEW |