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

Unified Diff: chrome/browser/extensions/extension_input_api.cc

Issue 6973029: Integrate WebUI Login with cros. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed patch staleness Created 9 years, 7 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 | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_input_api.cc
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index 53d013b0d0a7d6404724431da54654bd1b04ab63..d6078131291b4c4bc6964fbd8be246df5407334a 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -23,6 +23,7 @@
#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/input_method_library.h"
+#include "chrome/browser/chromeos/login/dom_login_display.h"
#endif
namespace {
@@ -64,6 +65,12 @@ void InputFunction::Run() {
}
views::Widget* SendKeyboardEventInputFunction::GetTopLevelWidget() {
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+ views::Widget* login_window = chromeos::DOMLoginDisplay::GetLoginWindow();
+ if (login_window)
+ return login_window;
+#endif
+
Browser* browser = GetCurrentBrowser();
if (!browser)
return NULL;
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698