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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 300063005: Add new flag for consistent identity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: return account consistency state if both flags set Created 6 years, 6 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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI) 1382 SINGLE_VALUE_TYPE(switches::kEnableWebMIDI)
1383 }, 1383 },
1384 { 1384 {
1385 "enable-new-profile-management", 1385 "enable-new-profile-management",
1386 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME, 1386 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME,
1387 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION, 1387 IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
1388 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 1388 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1389 SINGLE_VALUE_TYPE(switches::kNewProfileManagement) 1389 SINGLE_VALUE_TYPE(switches::kNewProfileManagement)
1390 }, 1390 },
1391 { 1391 {
1392 "enable-account-consistency",
1393 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME,
1394 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION,
1395 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1396 SINGLE_VALUE_TYPE(switches::kEnableAccountConsistency)
1397 },
1398 {
1392 "enable-fast-user-switching", 1399 "enable-fast-user-switching",
1393 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME, 1400 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME,
1394 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION, 1401 IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION,
1395 kOsMac | kOsWin | kOsLinux, 1402 kOsMac | kOsWin | kOsLinux,
1396 SINGLE_VALUE_TYPE(switches::kFastUserSwitching) 1403 SINGLE_VALUE_TYPE(switches::kFastUserSwitching)
1397 }, 1404 },
1398 { 1405 {
1399 "enable-new-avatar-menu", 1406 "enable-new-avatar-menu",
1400 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME, 1407 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME,
1401 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION, 1408 IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_DESCRIPTION,
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
2347 } 2354 }
2348 2355
2349 const Experiment* GetExperiments(size_t* count) { 2356 const Experiment* GetExperiments(size_t* count) {
2350 *count = num_experiments; 2357 *count = num_experiments;
2351 return experiments; 2358 return experiments;
2352 } 2359 }
2353 2360
2354 } // namespace testing 2361 } // namespace testing
2355 2362
2356 } // namespace about_flags 2363 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | components/signin/core/common/profile_management_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698