| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 BrowserSigninResourcesSource* source = new BrowserSigninResourcesSource(); |
| 219 BrowserThread::PostTask( | 219 BrowserThread::PostTask( |
| 220 BrowserThread::IO, FROM_HERE, | 220 BrowserThread::IO, FROM_HERE, |
| 221 NewRunnableMethod(Singleton<ChromeURLDataManager>::get(), | 221 NewRunnableMethod(ChromeURLDataManager::GetInstance(), |
| 222 &ChromeURLDataManager::AddDataSource, | 222 &ChromeURLDataManager::AddDataSource, |
| 223 make_scoped_refptr(source))); | 223 make_scoped_refptr(source))); |
| 224 } | 224 } |
| 225 | 225 |
| 226 BrowserSignin::~BrowserSignin() { | 226 BrowserSignin::~BrowserSignin() { |
| 227 delegate_ = NULL; | 227 delegate_ = NULL; |
| 228 } | 228 } |
| 229 | 229 |
| 230 void BrowserSignin::RequestSignin(TabContents* tab_contents, | 230 void BrowserSignin::RequestSignin(TabContents* tab_contents, |
| 231 const string16& suggested_email, | 231 const string16& suggested_email, |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 323 |
| 324 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { | 324 void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) { |
| 325 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. | 325 // TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog. |
| 326 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) | 326 #if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS) |
| 327 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); | 327 html_dialog_ui_delegate_ = CreateHtmlDialogUI(); |
| 328 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, | 328 ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_, |
| 329 html_dialog_ui_delegate_, | 329 html_dialog_ui_delegate_, |
| 330 tab_contents); | 330 tab_contents); |
| 331 #endif | 331 #endif |
| 332 } | 332 } |
| OLD | NEW |