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

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

Issue 668163002: Enabled the App Info dialog on the Extensions page by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added histogram back Created 6 years, 1 month 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 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 }, 1267 },
1268 #if defined(OS_ANDROID) 1268 #if defined(OS_ANDROID)
1269 { 1269 {
1270 "disable-gesture-requirement-for-media-playback", 1270 "disable-gesture-requirement-for-media-playback",
1271 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, 1271 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
1272 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, 1272 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
1273 kOsAndroid, 1273 kOsAndroid,
1274 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) 1274 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback)
1275 }, 1275 },
1276 #endif 1276 #endif
1277 #if defined(ENABLE_EXTENSIONS)
1278 {
1279 "disable-extension-info-dialog",
1280 IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_NAME,
1281 IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_DESCRIPTION,
1282 kOsWin | kOsLinux | kOsCrOS,
1283 SINGLE_VALUE_TYPE(extensions::switches::kDisableExtensionInfoDialog)
1284 },
1285 #endif
1277 #if defined(OS_CHROMEOS) 1286 #if defined(OS_CHROMEOS)
1278 { 1287 {
1279 "enable-virtual-keyboard", 1288 "enable-virtual-keyboard",
1280 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, 1289 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME,
1281 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, 1290 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION,
1282 kOsCrOS, 1291 kOsCrOS,
1283 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) 1292 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)
1284 }, 1293 },
1285 { 1294 {
1286 "enable-virtual-keyboard-overscroll", 1295 "enable-virtual-keyboard-overscroll",
(...skipping 19 matching lines...) Expand all
1306 ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView, 1315 ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView,
1307 keyboard::switches::kDisableInputView) 1316 keyboard::switches::kDisableInputView)
1308 }, 1317 },
1309 { 1318 {
1310 "enable-experimental-input-view-features", 1319 "enable-experimental-input-view-features",
1311 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, 1320 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
1312 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, 1321 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
1313 kOsCrOS, 1322 kOsCrOS,
1314 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) 1323 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures)
1315 }, 1324 },
1316 #if defined(ENABLE_EXTENSIONS)
1317 {
1318 "enable-extension-info-dialog",
1319 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_NAME,
1320 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_DESCRIPTION,
1321 kOsWin | kOsLinux | kOsCrOS,
1322 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionInfoDialog)
1323 },
1324 #endif
1325 #endif 1325 #endif
1326 { 1326 {
1327 "enable-simple-cache-backend", 1327 "enable-simple-cache-backend",
1328 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, 1328 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME,
1329 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, 1329 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION,
1330 kOsWin | kOsMac | kOsLinux | kOsCrOS, 1330 kOsWin | kOsMac | kOsLinux | kOsCrOS,
1331 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices) 1331 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices)
1332 }, 1332 },
1333 { 1333 {
1334 "enable-tcp-fast-open", 1334 "enable-tcp-fast-open",
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 } 2557 }
2558 2558
2559 const Experiment* GetExperiments(size_t* count) { 2559 const Experiment* GetExperiments(size_t* count) {
2560 *count = num_experiments; 2560 *count = num_experiments;
2561 return experiments; 2561 return experiments;
2562 } 2562 }
2563 2563
2564 } // namespace testing 2564 } // namespace testing
2565 2565
2566 } // namespace about_flags 2566 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698