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

Unified Diff: chrome/browser/chromeos/profiles/profile_helper.cc

Issue 218903005: Make push messaging not create InvalidationService for login and guest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make code resilient against tests that do not create the Default profile first. Created 6 years, 9 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/profiles/profile_helper.h ('k') | chrome/browser/chromeos/profiles/profile_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/profiles/profile_helper.cc
diff --git a/chrome/browser/chromeos/profiles/profile_helper.cc b/chrome/browser/chromeos/profiles/profile_helper.cc
index 702ed361506690016ac431e3f4eb4606060abe0e..cda520eef79767df51db0801c57f9806edac7cf2 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.cc
+++ b/chrome/browser/chromeos/profiles/profile_helper.cc
@@ -21,12 +21,6 @@ namespace chromeos {
namespace {
-base::FilePath GetSigninProfileDir() {
- ProfileManager* profile_manager = g_browser_process->profile_manager();
- base::FilePath user_data_dir = profile_manager->user_data_dir();
- return user_data_dir.AppendASCII(chrome::kInitialProfile);
-}
-
bool ShouldAddProfileDirPrefix(const std::string& user_id_hash) {
// Do not add profile dir prefix for legacy profile dir and test
// user profile. The reason of not adding prefix for test user profile
@@ -79,6 +73,13 @@ base::FilePath ProfileHelper::GetProfileDirByLegacyLoginProfileSwitch() {
}
// static
+base::FilePath ProfileHelper::GetSigninProfileDir() {
+ ProfileManager* profile_manager = g_browser_process->profile_manager();
+ base::FilePath user_data_dir = profile_manager->user_data_dir();
+ return user_data_dir.AppendASCII(chrome::kInitialProfile);
+}
+
+// static
Profile* ProfileHelper::GetSigninProfile() {
ProfileManager* profile_manager = g_browser_process->profile_manager();
return profile_manager->GetProfile(GetSigninProfileDir())->
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_helper.h ('k') | chrome/browser/chromeos/profiles/profile_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698