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

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: Updated code in response to review comments 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
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 82df0db3a97e3f5c5e36d559d35ba9bd2ccce41c..eb305f075615dc1567de98b151479929cc92fe0f 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -19,6 +19,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 {
@@ -60,6 +61,13 @@ void InputFunction::Run() {
}
views::Widget* SendKeyboardEventInputFunction::GetTopLevelWidget() {
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+ views::Widget* login_window =
+ chromeos::DOMLoginDisplay::GetCurrentLoginWindow();
+ if (login_window)
+ return login_window;
+#endif
+
Browser* browser = GetCurrentBrowser();
if (!browser)
return NULL;

Powered by Google App Engine
This is Rietveld 408576698