summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 03:44:28 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 03:44:28 +0000
commit7237bfcc6ded653b4ae2defaee6f1303b1744ede (patch)
tree532c17c7fcb634b20a694ccf2112b2fdae2c31c5 /chrome/browser/sync
parentc1527c043279d616ae78f71ba4117d3979fc5fcb (diff)
downloadchromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.zip
chromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.tar.gz
chromium_src-7237bfcc6ded653b4ae2defaee6f1303b1744ede.tar.bz2
Multi-Profiles: Enable multi-profiles by default for views ui
With this change mult-profiles is enabled by default for views ui. BUG=None TEST=None Review URL: http://codereview.chromium.org/7329034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/sync_ui_util.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 24a3de8..513f8b9 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/sync/sync_ui_util.h"
-#include "base/command_line.h"
#include "base/i18n/number_formatting.h"
#include "base/i18n/time_formatting.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/protocol/proto_enum_conversions.h"
#include "chrome/browser/sync/sessions/session_state.h"
@@ -76,9 +76,8 @@ string16 GetSyncedStateStatusLabel(ProfileSyncService* service) {
if (user_name.empty())
return label;
- const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
return l10n_util::GetStringFUTF16(
- browser_command_line.HasSwitch(switches::kMultiProfiles) ?
+ ProfileManager::IsMultipleProfilesEnabled() ?
IDS_PROFILES_SYNCED_TO_USER_WITH_TIME :
IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
user_name,