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

Side by Side Diff: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

Issue 13878010: Merge WebUILoginDisplayHost into LoginDisplayHostImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge + move method definition Created 7 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 5 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_shutdown.h" 10 #include "chrome/browser/browser_shutdown.h"
11 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 11 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
12 #include "chrome/browser/chromeos/login/webui_login_view.h" 12 #include "chrome/browser/chromeos/login/webui_login_view.h"
13 #include "chrome/browser/chromeos/mobile/mobile_activator.h" 13 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
14 #include "chrome/browser/platform_util.h" 14 #include "chrome/browser/platform_util.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/ui/browser_dialogs.h" 16 #include "chrome/browser/ui/browser_dialogs.h"
17 #include "chrome/browser/ui/simple_message_box.h" 17 #include "chrome/browser/ui/simple_message_box.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() { 93 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() {
94 MobileActivator::GetInstance()->RemoveObserver(this); 94 MobileActivator::GetInstance()->RemoveObserver(this);
95 } 95 }
96 96
97 void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) { 97 void MobileSetupDialogDelegate::ShowDialog(const std::string& service_path) {
98 service_path_ = service_path; 98 service_path_ = service_path;
99 99
100 gfx::NativeWindow parent = NULL; 100 gfx::NativeWindow parent = NULL;
101 // If we're on the login screen. 101 // If we're on the login screen.
102 if (chromeos::WebUILoginDisplayHost::default_host()) { 102 if (chromeos::LoginDisplayHostImpl::default_host()) {
103 chromeos::WebUILoginDisplayHost* webui_host = 103 chromeos::LoginDisplayHostImpl* webui_host =
104 static_cast<chromeos::WebUILoginDisplayHost*>( 104 static_cast<chromeos::LoginDisplayHostImpl*>(
105 chromeos::WebUILoginDisplayHost::default_host()); 105 chromeos::LoginDisplayHostImpl::default_host());
106 chromeos::WebUILoginView* login_view = webui_host->login_view(); 106 chromeos::WebUILoginView* login_view = webui_host->GetWebUILoginView();
107 if (login_view) 107 if (login_view)
108 parent = login_view->GetNativeWindow(); 108 parent = login_view->GetNativeWindow();
109 } 109 }
110 110
111 dialog_window_ = chrome::ShowWebDialog( 111 dialog_window_ = chrome::ShowWebDialog(
112 parent, 112 parent,
113 ProfileManager::GetDefaultProfileOrOffTheRecord(), 113 ProfileManager::GetDefaultProfileOrOffTheRecord(),
114 this); 114 this);
115 } 115 }
116 116
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 bool MobileSetupDialogDelegate::HandleContextMenu( 177 bool MobileSetupDialogDelegate::HandleContextMenu(
178 const content::ContextMenuParams& params) { 178 const content::ContextMenuParams& params) {
179 return true; 179 return true;
180 } 180 }
181 181
182 void MobileSetupDialogDelegate::OnActivationStateChanged( 182 void MobileSetupDialogDelegate::OnActivationStateChanged(
183 CellularNetwork* network, 183 CellularNetwork* network,
184 MobileActivator::PlanActivationState state, 184 MobileActivator::PlanActivationState state,
185 const std::string& error_description) { 185 const std::string& error_description) {
186 } 186 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698