summaryrefslogtreecommitdiffstats
path: root/ash/focus_cycler.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-26 14:49:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-26 14:49:09 +0000
commit32c2a46c5f820f42cdb37b869e99633d8a2d73ad (patch)
tree9e09f67ffd197c2067a286e4e45927ee5c5aa429 /ash/focus_cycler.cc
parent08f8feb39b2c8801dd39a1531fb5958644162e6d (diff)
downloadchromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.zip
chromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.tar.gz
chromium_src-32c2a46c5f820f42cdb37b869e99633d8a2d73ad.tar.bz2
Migrate client API setters/getters to take a RootWindow.
http://crbug.com/112131 TEST=none TBR=sky Review URL: https://chromiumcodereview.appspot.com/9455081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/focus_cycler.cc')
-rw-r--r--ash/focus_cycler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
index f1877d1..6a62757b 100644
--- a/ash/focus_cycler.cc
+++ b/ash/focus_cycler.cc
@@ -66,7 +66,8 @@ void FocusCycler::RotateFocus(Direction direction) {
Shell::GetInstance()->delegate()->GetCycleWindowList(
ShellDelegate::SOURCE_LAUNCHER, ShellDelegate::ORDER_MRU);
if (!windows.empty()) {
- aura::client::GetActivationClient()->ActivateWindow(windows[0]);
+ aura::client::GetActivationClient(Shell::GetRootWindow())->
+ ActivateWindow(windows[0]);
break;
}
} else {