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

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

Issue 664933006: Enabled the App Info dialog on the Extensions page by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Un-merged badly combined rebase Created 6 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 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 }, 1274 },
1275 #if defined(OS_ANDROID) 1275 #if defined(OS_ANDROID)
1276 { 1276 {
1277 "disable-gesture-requirement-for-media-playback", 1277 "disable-gesture-requirement-for-media-playback",
1278 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, 1278 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
1279 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, 1279 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
1280 kOsAndroid, 1280 kOsAndroid,
1281 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) 1281 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback)
1282 }, 1282 },
1283 #endif 1283 #endif
1284 #if defined(ENABLE_EXTENSIONS)
1285 {
1286 "disable-extension-info-dialog",
1287 IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_NAME,
1288 IDS_FLAGS_DISABLE_EXTENSION_INFO_DIALOG_DESCRIPTION,
1289 kOsWin | kOsLinux | kOsCrOS,
1290 SINGLE_VALUE_TYPE(extensions::switches::kDisableExtensionInfoDialog)
1291 },
1292 #endif
1284 #if defined(OS_CHROMEOS) 1293 #if defined(OS_CHROMEOS)
1285 { 1294 {
1286 "enable-virtual-keyboard", 1295 "enable-virtual-keyboard",
1287 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, 1296 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME,
1288 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, 1297 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION,
1289 kOsCrOS, 1298 kOsCrOS,
1290 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) 1299 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)
1291 }, 1300 },
1292 { 1301 {
1293 "enable-virtual-keyboard-overscroll", 1302 "enable-virtual-keyboard-overscroll",
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 kOsCrOS, 1336 kOsCrOS,
1328 SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect) 1337 SINGLE_VALUE_TYPE(chromeos::switches::kEnablePhysicalKeyboardAutocorrect)
1329 }, 1338 },
1330 { 1339 {
1331 "enable-experimental-input-view-features", 1340 "enable-experimental-input-view-features",
1332 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME, 1341 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
1333 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION, 1342 IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
1334 kOsCrOS, 1343 kOsCrOS,
1335 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures) 1344 SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures)
1336 }, 1345 },
1337 #if defined(ENABLE_EXTENSIONS)
1338 {
1339 "enable-extension-info-dialog",
1340 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_NAME,
1341 IDS_FLAGS_ENABLE_EXTENSION_INFO_DIALOG_DESCRIPTION,
1342 kOsWin | kOsLinux | kOsCrOS,
1343 SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionInfoDialog)
1344 },
1345 #endif
1346 #endif 1346 #endif
1347 { 1347 {
1348 "enable-simple-cache-backend", 1348 "enable-simple-cache-backend",
1349 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME, 1349 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME,
1350 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION, 1350 IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION,
1351 kOsWin | kOsMac | kOsLinux | kOsCrOS, 1351 kOsWin | kOsMac | kOsLinux | kOsCrOS,
1352 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices) 1352 MULTI_VALUE_TYPE(kSimpleCacheBackendChoices)
1353 }, 1353 },
1354 { 1354 {
1355 "enable-tcp-fast-open", 1355 "enable-tcp-fast-open",
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
2590 } 2590 }
2591 2591
2592 const Experiment* GetExperiments(size_t* count) { 2592 const Experiment* GetExperiments(size_t* count) {
2593 *count = num_experiments; 2593 *count = num_experiments;
2594 return experiments; 2594 return experiments;
2595 } 2595 }
2596 2596
2597 } // namespace testing 2597 } // namespace testing
2598 2598
2599 } // namespace about_flags 2599 } // 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