diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 22:40:52 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 22:40:52 +0000 |
| commit | 2f74428eee5f226ccdba805b91bd7e45a0f7a4e4 (patch) | |
| tree | 7bba8d381a8f4f46f487f92cd5ce81e978d0114a /chrome/browser/chrome_browser_main_extra_parts_aura.cc | |
| parent | eb929d6e96d746d808f1083dd54d7514e4c45e85 (diff) | |
| download | chromium_src-2f74428eee5f226ccdba805b91bd7e45a0f7a4e4.zip chromium_src-2f74428eee5f226ccdba805b91bd7e45a0f7a4e4.tar.gz chromium_src-2f74428eee5f226ccdba805b91bd7e45a0f7a4e4.tar.bz2 | |
More stuff -> ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9033006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_extra_parts_aura.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_extra_parts_aura.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc index 30d3fe2..89c4e4b 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc @@ -4,6 +4,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" +#include "ash/accelerators/accelerator_controller.h" #include "base/command_line.h" #include "chrome/common/chrome_switches.h" #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" @@ -11,7 +12,6 @@ #include "chrome/browser/ui/views/aura/screenshot_taker.h" #include "ui/aura/root_window.h" #include "ui/aura_shell/shell.h" -#include "ui/aura_shell/shell_accelerator_controller.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/system/runtime_environment.h" |