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

Side by Side Diff: chrome/browser/importer/importer_host.cc

Issue 10411025: Reverted 136345 - Ran into GAIA dosserver issues in prod for http://accounts.google.com. We are goi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 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/importer/importer_host.h" 5 #include "chrome/browser/importer/importer_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 InvokeTaskIfDone(); 154 InvokeTaskIfDone();
155 } 155 }
156 156
157 void ImporterHost::OnGoogleGAIACookieChecked(bool result) { 157 void ImporterHost::OnGoogleGAIACookieChecked(bool result) {
158 #if defined(OS_WIN) 158 #if defined(OS_WIN)
159 if (!result) { 159 if (!result) {
160 browser::ShowMessageBox(NULL, 160 browser::ShowMessageBox(NULL,
161 l10n_util::GetStringUTF16(IDS_IMPORTER_GOOGLE_LOGIN_TEXT), string16(), 161 l10n_util::GetStringUTF16(IDS_IMPORTER_GOOGLE_LOGIN_TEXT), string16(),
162 browser::MESSAGE_BOX_TYPE_INFORMATION); 162 browser::MESSAGE_BOX_TYPE_INFORMATION);
163 163
164 GURL url("https://accounts.google.com/ServiceLogin"); 164 GURL url("https://www.google.com/accounts/ServiceLogin");
165 DCHECK(profile_); 165 DCHECK(profile_);
166 Browser* browser = browser::FindLastActiveWithProfile(profile_); 166 Browser* browser = browser::FindLastActiveWithProfile(profile_);
167 if (browser) 167 if (browser)
168 browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); 168 browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED);
169 169
170 MessageLoop::current()->PostTask(FROM_HERE, base::Bind( 170 MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
171 &ImporterHost::OnImportLockDialogEnd, this, false)); 171 &ImporterHost::OnImportLockDialogEnd, this, false));
172 } else { 172 } else {
173 is_source_readable_ = true; 173 is_source_readable_ = true;
174 InvokeTaskIfDone(); 174 InvokeTaskIfDone();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 void ImporterHost::BookmarkModelChanged() { 257 void ImporterHost::BookmarkModelChanged() {
258 } 258 }
259 259
260 void ImporterHost::Observe(int type, 260 void ImporterHost::Observe(int type,
261 const content::NotificationSource& source, 261 const content::NotificationSource& source,
262 const content::NotificationDetails& details) { 262 const content::NotificationDetails& details) {
263 DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED); 263 DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
264 registrar_.RemoveAll(); 264 registrar_.RemoveAll();
265 InvokeTaskIfDone(); 265 InvokeTaskIfDone();
266 } 266 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/online_attempt_unittest.cc ('k') | chrome/browser/net/gaia/gaia_oauth_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698