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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/chromeos/login/login_html_dialog.h" 9 #include "chrome/browser/chromeos/login/login_html_dialog.h"
10 #include "chrome/browser/chromeos/status/status_area_host.h" 10 #include "chrome/browser/chromeos/status/status_area_host.h"
11 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
11 #include "content/browser/tab_contents/tab_contents_delegate.h" 12 #include "content/browser/tab_contents/tab_contents_delegate.h"
12 #include "views/view.h" 13 #include "views/view.h"
13 14
14 class DOMView; 15 class DOMView;
15 class GURL; 16 class GURL;
16 class Profile; 17 class Profile;
17 class WebUI; 18 class WebUI;
18 19
19 namespace views { 20 namespace views {
20 class Widget; 21 class Widget;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual void InitStatusArea(); 91 virtual void InitStatusArea();
91 92
92 StatusAreaView* status_area_; 93 StatusAreaView* status_area_;
93 94
94 Profile* profile_; 95 Profile* profile_;
95 96
96 // DOMView for rendering a webpage as a webui login. 97 // DOMView for rendering a webpage as a webui login.
97 DOMView* webui_login_; 98 DOMView* webui_login_;
98 99
99 private: 100 private:
101 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.
102
100 // Overridden from TabContentsDelegate. 103 // Overridden from TabContentsDelegate.
101 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; 104 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
105 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
102 106
103 // Window that contains status area. 107 // Window that contains status area.
104 // TODO(nkostylev): Temporary solution till we have 108 // TODO(nkostylev): Temporary solution till we have
105 // RenderWidgetHostViewViews working. 109 // RenderWidgetHostViewViews working.
106 views::Widget* status_window_; 110 views::Widget* status_window_;
107 111
108 views::Accelerator accel_toggle_accessibility_; 112 // Converts keyboard events on the TabContents to accelerators.
113 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
114
115 // Maps installed accelerators to OOBE webui accelerator identifiers.
116 AccelMap accel_map_;
109 117
110 // Proxy settings dialog that can be invoked from network menu. 118 // Proxy settings dialog that can be invoked from network menu.
111 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_; 119 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
112 120
113 DISALLOW_COPY_AND_ASSIGN(WebUILoginView); 121 DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
114 }; 122 };
115 123
116 } // namespace chromeos 124 } // namespace chromeos
117 125
118 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 126 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_
OLDNEW
« 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