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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_view.h

Issue 7640023: [ChromeOS] WebUILoginView returns true for IsPopupOrPanel. (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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // DOMView for rendering a webpage as a webui login. 104 // DOMView for rendering a webpage as a webui login.
105 DOMView* webui_login_; 105 DOMView* webui_login_;
106 106
107 private: 107 private:
108 // Map type for the accelerator-to-identifier map. 108 // Map type for the accelerator-to-identifier map.
109 typedef std::map<views::Accelerator, std::string> AccelMap; 109 typedef std::map<views::Accelerator, std::string> AccelMap;
110 110
111 // Overridden from TabContentsDelegate. 111 // Overridden from TabContentsDelegate.
112 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE; 112 virtual bool HandleContextMenu(const ContextMenuParams& params) OVERRIDE;
113 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
achuithb 2011/08/12 18:34:49 Also OVERRIDE?
xiyuan 2011/08/12 19:32:56 Done.
114 virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE;
113 virtual bool TakeFocus(bool reverse) OVERRIDE; 115 virtual bool TakeFocus(bool reverse) OVERRIDE;
114 virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
115 116
116 // Window that contains status area. 117 // Window that contains status area.
117 // TODO(nkostylev): Temporary solution till we have 118 // TODO(nkostylev): Temporary solution till we have
118 // RenderWidgetHostViewViews working. 119 // RenderWidgetHostViewViews working.
119 views::Widget* status_window_; 120 views::Widget* status_window_;
120 121
121 // Converts keyboard events on the TabContents to accelerators. 122 // Converts keyboard events on the TabContents to accelerators.
122 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; 123 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
123 124
124 // Maps installed accelerators to OOBE webui accelerator identifiers. 125 // Maps installed accelerators to OOBE webui accelerator identifiers.
125 AccelMap accel_map_; 126 AccelMap accel_map_;
126 127
127 // Proxy settings dialog that can be invoked from network menu. 128 // Proxy settings dialog that can be invoked from network menu.
128 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_; 129 scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
129 130
130 // Watches webui_login_'s TabContents rendering. 131 // Watches webui_login_'s TabContents rendering.
131 scoped_ptr<TabFirstRenderWatcher> tab_watcher_; 132 scoped_ptr<TabFirstRenderWatcher> tab_watcher_;
132 133
133 // Whether the host window is frozen. 134 // Whether the host window is frozen.
134 bool host_window_frozen_; 135 bool host_window_frozen_;
135 136
136 DISALLOW_COPY_AND_ASSIGN(WebUILoginView); 137 DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
137 }; 138 };
138 139
139 } // namespace chromeos 140 } // namespace chromeos
140 141
141 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_LOGIN_VIEW_H_ 142 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698