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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index ee67958de0b9f685c35deceb5e57917483b8b6b8..bd6e9f6fa9e8d7482f31b03fd4c5ab36755d87e1 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -122,12 +122,12 @@ bool HandleRotateScreen() {
case 13: delta = 180; break;
}
i = (i + 1) % 14;
- ash::Shell::GetRootWindow()->layer()->GetAnimator()->
+ ash::Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->
set_preemption_strategy(ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
new ui::LayerAnimationSequence(new ui::ScreenRotation(delta)));
- screen_rotation->AddObserver(ash::Shell::GetRootWindow());
- ash::Shell::GetRootWindow()->layer()->GetAnimator()->StartAnimation(
+ screen_rotation->AddObserver(ash::Shell::GetPrimaryRootWindow());
+ ash::Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->StartAnimation(
screen_rotation.release());
return true;
}
@@ -144,12 +144,12 @@ bool HandleToggleDesktopBackgroundMode() {
}
bool HandleToggleRootWindowFullScreen() {
- ash::Shell::GetRootWindow()->ToggleFullScreen();
+ ash::Shell::GetPrimaryRootWindow()->ToggleFullScreen();
return true;
}
bool HandlePrintLayerHierarchy() {
- aura::RootWindow* root_window = ash::Shell::GetRootWindow();
+ aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
ui::PrintLayerHierarchy(root_window->layer(),
root_window->last_mouse_location());
return true;
@@ -319,7 +319,7 @@ bool AcceleratorController::AcceleratorPressed(
return HandleNewWindow(false /* is_incognito */);
case TAKE_SCREENSHOT:
if (screenshot_delegate_.get()) {
- aura::RootWindow* root_window = Shell::GetRootWindow();
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
screenshot_delegate_->HandleTakeScreenshot(root_window);
}
// Return true to prevent propagation of the key event.
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698