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/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
| (...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 711 GetRootWindowController(root_window)->SetShelfAutoHideBehavior(behavior); | 711 GetRootWindowController(root_window)->SetShelfAutoHideBehavior(behavior); |
| 712 } | 712 } |
| 713 | 713 |
| 714 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior( | 714 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior( |
| 715 aura::RootWindow* root_window) const { | 715 aura::RootWindow* root_window) const { |
| 716 return GetRootWindowController(root_window)->GetShelfAutoHideBehavior(); | 716 return GetRootWindowController(root_window)->GetShelfAutoHideBehavior(); |
| 717 } | 717 } |
| 718 | 718 |
| 719 void Shell::SetShelfAlignment(ShelfAlignment alignment, | 719 void Shell::SetShelfAlignment(ShelfAlignment alignment, |
| 720 aura::RootWindow* root_window) { | 720 aura::RootWindow* root_window) { |
| 721 if (GetRootWindowController(root_window)->SetShelfAlignment(alignment)) | 721 if (GetRootWindowController(root_window)->SetShelfAlignment(alignment)) |
|
oshima
2012/12/14 11:03:55
nit: you need {}
Jun Mukai
2012/12/14 18:47:16
Done.
| |
| 722 FOR_EACH_OBSERVER(ShellObserver, observers_, OnShelfAlignmentChanged()); | 722 FOR_EACH_OBSERVER( |
| 723 ShellObserver, observers_, OnShelfAlignmentChanged(root_window)); | |
| 723 } | 724 } |
| 724 | 725 |
| 725 ShelfAlignment Shell::GetShelfAlignment(aura::RootWindow* root_window) { | 726 ShelfAlignment Shell::GetShelfAlignment(aura::RootWindow* root_window) { |
| 726 return GetRootWindowController(root_window)->GetShelfAlignment(); | 727 return GetRootWindowController(root_window)->GetShelfAlignment(); |
| 727 } | 728 } |
| 728 | 729 |
| 729 void Shell::SetDimming(bool should_dim) { | 730 void Shell::SetDimming(bool should_dim) { |
| 730 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 731 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
| 731 for (RootWindowControllerList::iterator iter = controllers.begin(); | 732 for (RootWindowControllerList::iterator iter = controllers.begin(); |
| 732 iter != controllers.end(); ++iter) | 733 iter != controllers.end(); ++iter) |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 895 | 896 |
| 896 //////////////////////////////////////////////////////////////////////////////// | 897 //////////////////////////////////////////////////////////////////////////////// |
| 897 // Shell, aura::client::ActivationChangeObserver implementation: | 898 // Shell, aura::client::ActivationChangeObserver implementation: |
| 898 | 899 |
| 899 void Shell::OnWindowActivated(aura::Window* gained_active, | 900 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 900 aura::Window* lost_active) { | 901 aura::Window* lost_active) { |
| 901 active_root_window_ = gained_active->GetRootWindow(); | 902 active_root_window_ = gained_active->GetRootWindow(); |
| 902 } | 903 } |
| 903 | 904 |
| 904 } // namespace ash | 905 } // namespace ash |
| OLD | NEW |