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

Unified Diff: ash/accelerators/accelerator_controller.h

Issue 9242003: Handle Caps Lock short cut (Shift+Search) in ash [part 1 of 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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: ash/accelerators/accelerator_controller.h
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index 55c3ed5e49e614568038d275337aca656f1eb6ba..7d646b42f920b9d22ba346ba08cbfe7e9d60abae 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -21,6 +21,7 @@ class AcceleratorManager;
namespace ash {
class ScreenshotDelegate;
+class CapsLockDelegate;
// AcceleratorController provides functions for registering or unregistering
// global keyboard accelerators, which are handled earlier than any windows. It
@@ -55,7 +56,9 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
virtual bool CanHandleAccelerators() const OVERRIDE;
- void SetScreenshotDelegate(ScreenshotDelegate* screenshot_delegate);
+ void SetScreenshotDelegate(
+ scoped_ptr<ScreenshotDelegate> screenshot_delegate);
mazda 2012/01/17 07:34:05 I prefer this signature change is done first in an
Yusuke Sato 2012/01/17 08:24:52 Done. Please review https://chromiumcodereview.app
+ void SetCapsLockDelegate(scoped_ptr<CapsLockDelegate> caps_lock_delegate);
private:
// Initialize the accelerators this class handles as a target.
@@ -64,6 +67,7 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
scoped_ptr<ScreenshotDelegate> screenshot_delegate_;
+ scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
// A map from accelerators to the AcceleratorAction values, which are used in
// the implementation.
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller.cc » ('j') | ash/accelerators/accelerator_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698