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

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

Issue 1344443002: Implement new password separated sign in flow for chrome desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged Created 5 years, 2 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
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 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME, 1390 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME,
1391 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION, 1391 IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION,
1392 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 1392 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1393 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency, 1393 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency,
1394 switches::kDisableAccountConsistency)}, 1394 switches::kDisableAccountConsistency)},
1395 {"enable-iframe-based-signin", 1395 {"enable-iframe-based-signin",
1396 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME, 1396 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME,
1397 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION, 1397 IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION,
1398 kOsMac | kOsWin | kOsLinux, 1398 kOsMac | kOsWin | kOsLinux,
1399 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)}, 1399 SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)},
1400 {"enable-password-separated-signin-flow",
1401 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_NAME,
1402 IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION,
1403 kOsWin | kOsLinux,
1404 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow,
1405 switches::kDisablePasswordSeparatedSigninFlow)},
1400 {"enable-google-profile-info", 1406 {"enable-google-profile-info",
1401 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME, 1407 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME,
1402 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION, 1408 IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION,
1403 kOsMac | kOsWin | kOsLinux, 1409 kOsMac | kOsWin | kOsLinux,
1404 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)}, 1410 SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)},
1405 #if defined(ENABLE_APP_LIST) 1411 #if defined(ENABLE_APP_LIST)
1406 {"reset-app-list-install-state", 1412 {"reset-app-list-install-state",
1407 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, 1413 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME,
1408 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, 1414 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION,
1409 kOsMac | kOsWin | kOsLinux, 1415 kOsMac | kOsWin | kOsLinux,
(...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
2757 } 2763 }
2758 2764
2759 const Experiment* GetExperiments(size_t* count) { 2765 const Experiment* GetExperiments(size_t* count) {
2760 *count = num_experiments; 2766 *count = num_experiments;
2761 return experiments; 2767 return experiments;
2762 } 2768 }
2763 2769
2764 } // namespace testing 2770 } // namespace testing
2765 2771
2766 } // namespace about_flags 2772 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698