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

Side by Side Diff: chrome/browser/profiles/profiles_state.cc

Issue 271533004: Turning on MultiProfile by default for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profiles/profiles_state.h" 5 #include "chrome/browser/profiles/profiles_state.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_info_cache.h" 13 #include "chrome/browser/profiles/profile_info_cache.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "components/signin/core/browser/profile_oauth2_token_service.h" 19 #include "components/signin/core/browser/profile_oauth2_token_service.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 22
23 #if defined(OS_CHROMEOS)
24 #include "chrome/browser/chromeos/login/user_manager.h"
25 #endif
26
27 namespace profiles { 23 namespace profiles {
28 24
29 bool IsMultipleProfilesEnabled() { 25 bool IsMultipleProfilesEnabled() {
30 #if defined(OS_ANDROID) 26 #if defined(OS_ANDROID)
31 return false; 27 return false;
32 #endif 28 #endif
33 #if defined(OS_CHROMEOS)
34 return chromeos::UserManager::IsMultipleProfilesAllowed();
35 #endif
36
37 return true; 29 return true;
38 } 30 }
39 31
40 base::FilePath GetDefaultProfileDir(const base::FilePath& user_data_dir) { 32 base::FilePath GetDefaultProfileDir(const base::FilePath& user_data_dir) {
41 base::FilePath default_profile_dir(user_data_dir); 33 base::FilePath default_profile_dir(user_data_dir);
42 default_profile_dir = 34 default_profile_dir =
43 default_profile_dir.AppendASCII(chrome::kInitialProfile); 35 default_profile_dir.AppendASCII(chrome::kInitialProfile);
44 return default_profile_dir; 36 return default_profile_dir;
45 } 37 }
46 38
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 99
108 return accounts; 100 return accounts;
109 } 101 }
110 102
111 bool IsRegularOrGuestSession(Browser* browser) { 103 bool IsRegularOrGuestSession(Browser* browser) {
112 Profile* profile = browser->profile(); 104 Profile* profile = browser->profile();
113 return profile->IsGuestSession() || !profile->IsOffTheRecord(); 105 return profile->IsGuestSession() || !profile->IsOffTheRecord();
114 } 106 }
115 107
116 } // namespace profiles 108 } // namespace profiles
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698