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

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

Issue 12088022: Enable cloud policy by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review feedback Created 7 years, 10 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 }, 1214 },
1215 #endif 1215 #endif
1216 { 1216 {
1217 "enable-touch-drag-drop", 1217 "enable-touch-drag-drop",
1218 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, 1218 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
1219 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, 1219 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
1220 kOsWin | kOsCrOS, 1220 kOsWin | kOsCrOS,
1221 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) 1221 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1222 }, 1222 },
1223 { 1223 {
1224 "load-cloud-policy-on-signin", 1224 "disable-cloud-policy-on-signin",
1225 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, 1225 IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_NAME,
1226 IDS_FLAGS_DESKTOP_CLOUD_POLICY_DESCRIPTION, 1226 IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_DESCRIPTION,
1227 kOsWin | kOsMac | kOsLinux, 1227 kOsWin | kOsMac | kOsLinux,
1228 SINGLE_VALUE_TYPE(switches::kLoadCloudPolicyOnSignin) 1228 SINGLE_VALUE_TYPE(switches::kDisableCloudPolicyOnSignin)
1229 }, 1229 },
1230 { 1230 {
1231 "enable-rich-notifications", 1231 "enable-rich-notifications",
1232 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, 1232 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME,
1233 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, 1233 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION,
1234 kOsWin | kOsCrOS, 1234 kOsWin | kOsCrOS,
1235 SINGLE_VALUE_TYPE(switches::kEnableRichNotifications) 1235 SINGLE_VALUE_TYPE(switches::kEnableRichNotifications)
1236 }, 1236 },
1237 { 1237 {
1238 "full-history-sync", 1238 "full-history-sync",
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 } 1684 }
1685 1685
1686 const Experiment* GetExperiments(size_t* count) { 1686 const Experiment* GetExperiments(size_t* count) {
1687 *count = num_experiments; 1687 *count = num_experiments;
1688 return experiments; 1688 return experiments;
1689 } 1689 }
1690 1690
1691 } // namespace testing 1691 } // namespace testing
1692 1692
1693 } // namespace about_flags 1693 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698