summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
-rw-r--r--ash/accelerators/accelerator_controller.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index ae314fb..0bd5ece 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -15,6 +15,7 @@
#include "ash/launcher/launcher_model.h"
#include "ash/monitor/monitor_controller.h"
#include "ash/monitor/multi_monitor_manager.h"
+#include "ash/root_window_controller.h"
#include "ash/screenshot_delegate.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
@@ -112,9 +113,9 @@ bool HandleShowTaskManager() {
// Rotates the default window container.
bool HandleRotateWindows() {
- aura::Window* target = Shell::GetContainer(
- Shell::GetPrimaryRootWindow(),
- internal::kShellWindowId_DefaultContainer);
+ aura::Window* target =
+ Shell::GetPrimaryRootWindowController()->GetContainer(
+ internal::kShellWindowId_DefaultContainer);
scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
new ui::LayerAnimationSequence(new ui::ScreenRotation(360)));
target->layer()->GetAnimator()->StartAnimation(
@@ -191,8 +192,8 @@ void PrintWindowHierarchy(aura::Window* window, int indent) {
bool HandlePrintWindowHierarchy() {
DLOG(INFO) << "Window hierarchy:";
aura::Window* container =
- Shell::GetContainer(Shell::GetPrimaryRootWindow(),
- internal::kShellWindowId_DefaultContainer);
+ Shell::GetPrimaryRootWindowController()->GetContainer(
+ internal::kShellWindowId_DefaultContainer);
PrintWindowHierarchy(container, 0);
return true;
}