| OLD | NEW |
| 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 #include "chrome/browser/browser_signin.h" | 5 #include "chrome/browser/browser_signin.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 signin_->Cancel(); | 208 signin_->Cancel(); |
| 209 } | 209 } |
| 210 signin_->GetProfileSyncService()->OnUserSubmittedAuth( | 210 signin_->GetProfileSyncService()->OnUserSubmittedAuth( |
| 211 username, password, captcha, access_code); | 211 username, password, captcha, access_code); |
| 212 } | 212 } |
| 213 | 213 |
| 214 BrowserSignin::BrowserSignin(Profile* profile) | 214 BrowserSignin::BrowserSignin(Profile* profile) |
| 215 : profile_(profile), | 215 : profile_(profile), |
| 216 delegate_(NULL), | 216 delegate_(NULL), |
| 217 html_dialog_ui_delegate_(NULL) { | 217 html_dialog_ui_delegate_(NULL) { |
| 218 BrowserSigninResourcesSource* source = new BrowserSigninResourcesSource(); | 218 // profile is NULL during testing. |
| 219 BrowserThread::PostTask( | 219 if (profile) { |
| 220 BrowserThread::IO, FROM_HERE, | 220 BrowserSigninResourcesSource* source = new BrowserSigninResourcesSource(); |
| 221 NewRunnableMethod(ChromeURLDataManager::GetInstance(), | 221 profile->GetChromeURLDataManager()->AddDataSource(source); |
| 222 &ChromeURLDataManager::AddDataSource, | 222 } |
| 223 make_scoped_refptr(source))); | |
| 224 } | 223 } |
| 225 | 224 |
| 226 BrowserSignin::~BrowserSignin() { | 225 BrowserSignin::~BrowserSignin() { |
| 227 delegate_ = NULL; | 226 delegate_ = NULL; |
| 228 } | 227 } |
| 229 | 228 |
| 230 void BrowserSignin::RequestSignin(TabContents* tab_contents, | 229 void BrowserSignin::RequestSignin(TabContents* tab_contents, |
| 231 const string16& suggested_email, | 230 const string16& suggested_email, |
| 232 const string16& login_message, | 231 const string16& login_message, |
| 233 SigninDelegate* delegate) { | 232 SigninDelegate* delegate) { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 322 |
| 324 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { | 323 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { |
| 325 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. | 324 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. |
| 326 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) | 325 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) |
| 327 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); | 326 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); |
| 328 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, | 327 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, |
| 329 html_dialog_ui_delegate_, | 328 html_dialog_ui_delegate_, |
| 330 tab_contents); | 329 tab_contents); |
| 331 #endif | 330 #endif |
| 332 } | 331 } |
| OLD | NEW |