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

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

Issue 24980006: ash: Remove old lock animation implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/screen_locker.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 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), 1132 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
1133 }, 1133 },
1134 { 1134 {
1135 "captive-portal-detector", 1135 "captive-portal-detector",
1136 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME, 1136 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME,
1137 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION, 1137 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION,
1138 kOsCrOSOwnerOnly, 1138 kOsCrOSOwnerOnly,
1139 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices), 1139 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices),
1140 }, 1140 },
1141 { 1141 {
1142 "disable-new-lock-animations",
1143 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS,
1144 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION,
1145 kOsCrOS,
1146 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewLockAnimations),
1147 },
1148 {
1149 "file-manager-show-checkboxes", 1142 "file-manager-show-checkboxes",
1150 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME, 1143 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME,
1151 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_DESCRIPTION, 1144 IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_DESCRIPTION,
1152 kOsCrOS, 1145 kOsCrOS,
1153 SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerShowCheckboxes) 1146 SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerShowCheckboxes)
1154 }, 1147 },
1155 { 1148 {
1156 "file-manager-enable-webstore-integration", 1149 "file-manager-enable-webstore-integration",
1157 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION, 1150 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION,
1158 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION, 1151 IDS_FLAGS_FILE_MANAGER_ENABLE_WEBSTORE_INTEGRATION_DESCRIPTION,
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
2273 } 2266 }
2274 2267
2275 const Experiment* GetExperiments(size_t* count) { 2268 const Experiment* GetExperiments(size_t* count) {
2276 *count = num_experiments; 2269 *count = num_experiments;
2277 return experiments; 2270 return experiments;
2278 } 2271 }
2279 2272
2280 } // namespace testing 2273 } // namespace testing
2281 2274
2282 } // namespace about_flags 2275 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698