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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.h

Issue 7550043: CrOS OOBE: Grab accelerators in native code instead of JS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 9 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index 3d888c53ce5b3ce3abbced0b1107efda46efdc7d..20c02f18e0a8fb8ba4f8d614f196c3e1fe48add2 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -8,6 +8,7 @@
#include "chrome/browser/chromeos/login/login_html_dialog.h"
#include "chrome/browser/chromeos/status/status_area_host.h"
+#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "views/view.h"
@@ -97,16 +98,24 @@ class WebUILoginView : public views::View,
DOMView* webui_login_;
private:
+ // Map type for the accelerator-to-identifier map.
+ typedef std::map<views::Accelerator, std::string> AccelMap;
+
// Overridden from TabContentsDelegate.
virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
virtual bool TakeFocus(bool reverse) OVERRIDE;
+ virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
// Window that contains status area.
// TODO(nkostylev): Temporary solution till we have
// RenderWidgetHostViewViews working.
views::Widget* status_window_;
- views::Accelerator accel_toggle_accessibility_;
+ // Converts keyboard events on the TabContents to accelerators.
+ UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
+
+ // Maps installed accelerators to OOBE webui accelerator identifiers.
+ AccelMap accel_map_;
// Proxy settings dialog that can be invoked from network menu.
scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698