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

Unified Diff: chrome/browser/chrome_browser_main_extra_parts_aura.cc

Issue 9225004: Handle Caps Lock short cut (Shift+Search) in ash [part 2 of 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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
Index: chrome/browser/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index fca681202023a2618f3e10bc32196a27729cbae6..1e6059e31efaecb61816a285fc872f7d0934d910 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -8,6 +8,7 @@
#include "ash/shell.h"
#include "base/command_line.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/ui/views/aura/caps_lock_handler.h"
#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
#include "chrome/browser/ui/views/aura/screen_orientation_listener.h"
#include "chrome/browser/ui/views/aura/screenshot_taker.h"
@@ -45,6 +46,8 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
// AcceleratorController takes ownership of ScreenshotDelegate.
shell->accelerator_controller()->SetScreenshotDelegate(new ScreenshotTaker);
+ shell->accelerator_controller()->SetCapsLockDelegate(
+ scoped_ptr<ash::CapsLockDelegate>(new CapsLockHandler).Pass());
// Make sure the singleton ScreenOrientationListener object is created.
ScreenOrientationListener::GetInstance();

Powered by Google App Engine
This is Rietveld 408576698