summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_dispatcher_linux.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 20:10:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 20:10:34 +0000
commite73bd78073df416f9bc1f9633ef6b55fc1362d5e (patch)
treea13f744560deebaff1de463c16fd1df46c95916e /ash/accelerators/accelerator_dispatcher_linux.cc
parentf4dda48296102f4401ecf82c6dbd91c706cb6ecd (diff)
downloadchromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.zip
chromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.tar.gz
chromium_src-e73bd78073df416f9bc1f9633ef6b55fc1362d5e.tar.bz2
Provide a RootWindow instance getter on the shell, in preparation for removing RootWindow::GetInstance().
http://crbug.com/112131 TEST=compiles Review URL: https://chromiumcodereview.appspot.com/9395038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_dispatcher_linux.cc')
-rw-r--r--ash/accelerators/accelerator_dispatcher_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_dispatcher_linux.cc b/ash/accelerators/accelerator_dispatcher_linux.cc
index 76a5767..05d28c5 100644
--- a/ash/accelerators/accelerator_dispatcher_linux.cc
+++ b/ash/accelerators/accelerator_dispatcher_linux.cc
@@ -31,7 +31,7 @@ base::MessagePumpDispatcher::DispatchStatus AcceleratorDispatcher::Dispatch(
if (!associated_window_)
return EVENT_QUIT;
if (!associated_window_->CanReceiveEvents())
- return aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev);
+ return Shell::GetRootWindow()->GetDispatcher()->Dispatch(xev);
if (xev->type == KeyPress) {
ash::AcceleratorController* accelerator_controller =