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

Unified Diff: chrome/browser/chrome_browser_main_extra_parts_aura.h

Issue 9264002: aura: Add Ctrl-Shift-Q for quit and Ctrl-Shift-L for lock in chromeos. (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: chrome/browser/chrome_browser_main_extra_parts_aura.h
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.h b/chrome/browser/chrome_browser_main_extra_parts_aura.h
index d7828825eb4670453cd2ff1dd0b29a965bebabc1..181c9f147b968e22ad64fd9ed625ed9c4f4787fb 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.h
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,14 +8,21 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "chrome/browser/chrome_browser_main_extra_parts.h"
+#include "ui/base/accelerators/accelerator.h"
-class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
+class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts,
+ public ui::AcceleratorTarget {
public:
ChromeBrowserMainExtraPartsAura();
+ // Overridden from ChromeBrowserMainExtraParts
virtual void PreProfileInit() OVERRIDE;
virtual void PostMainMessageLoopRun() OVERRIDE;
+ // Overridden from ui::AcceleratorTarget
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+ virtual bool CanHandleAccelerators() const;
+
private:
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAura);
};

Powered by Google App Engine
This is Rietveld 408576698