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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 13633003: Part of multiprofile implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: m 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/login_performer.cc ('k') | chrome/browser/chromeos/login/login_web_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index e811e1034ebaecfe2c966778451bfc149fc748fb..a40d016557875ec128eb113d7e6b1a1be103247b 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -47,6 +47,7 @@
#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
#include "chrome/browser/chromeos/policy/network_configuration_updater.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/cros_settings_names.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -127,11 +128,14 @@ class LoginUtilsImpl
net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
// During tests, the browser_process may not be initialized yet causing
// this to fail.
- if (g_browser_process) {
+ // TODO(dzhioev): Disabled in tests for a while.
+ // TODO(dzhioev): Move prewarm out of LoginUtils.
+ if (g_browser_process &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
registrar_.Add(
this,
chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
- content::Source<Profile>(ProfileManager::GetDefaultProfile()));
+ content::Source<Profile>(ProfileHelper::GetSigninProfile()));
}
}
@@ -800,7 +804,7 @@ class WarmingObserver : public ConnectivityStateHelperObserver,
registrar_.Add(
this,
chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
- content::Source<Profile>(ProfileManager::GetDefaultProfile()));
+ content::Source<Profile>(ProfileHelper::GetSigninProfile()));
}
}
« no previous file with comments | « chrome/browser/chromeos/login/login_performer.cc ('k') | chrome/browser/chromeos/login/login_web_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698