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

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: 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
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 d8a6b4d437e8dc5e13f65678ebcdb2d11f7685a0..b9080c2e3ff1451ec10c86c27c03854da8deb99d 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,15 +98,22 @@ class WebUILoginView : public views::View,
DOMView* webui_login_;
private:
+ typedef std::map<views::Accelerator, std::string> AccelMap;
James Hawkins 2011/08/05 20:19:50 Document the typedef.
Mattias Nissler (ping if slow) 2011/08/08 11:11:47 Done.
+
// Overridden from TabContentsDelegate.
virtual bool HandleContextMenu(const ContextMenuParams& params) 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') | chrome/browser/chromeos/login/webui_login_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698