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

Unified Diff: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

Issue 10790133: Enable Verizon Activation from OOBE/Login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/ui/views/ash/chrome_shell_delegate.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
index cbdee9403b09daca3c0be32558ac8f1bd3f24c8b..49663fe3f05ed994de89d63decb9ef2a19086e8b 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc
@@ -7,6 +7,8 @@
#include "base/bind.h"
#include "base/memory/singleton.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/login/webui_login_display_host.h"
+#include "chrome/browser/chromeos/login/webui_login_view.h"
#include "chrome/browser/chromeos/mobile/mobile_activator.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -93,8 +95,20 @@ MobileSetupDialogDelegate::~MobileSetupDialogDelegate() {
void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) {
service_path_ = service_path;
+
+ gfx::NativeWindow parent = NULL;
+ // If we're on the login screen.
+ if (chromeos::WebUILoginDisplayHost::default_host()) {
+ chromeos::WebUILoginDisplayHost* webui_host =
+ (chromeos::WebUILoginDisplayHost*)
sky 2012/07/24 04:28:20 static_cast
rkc 2012/07/24 22:07:03 Done.
+ chromeos::WebUILoginDisplayHost::default_host();
+ chromeos::WebUILoginView* login_view = webui_host->login_view();
+ if (login_view)
+ parent = login_view->GetNativeWindow();
+ }
+
dialog_window_ = chrome::ShowWebDialog(
- NULL,
+ parent,
ProfileManager::GetDefaultProfileOrOffTheRecord(),
this);
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698