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

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

Issue 312423004: Enable app info dialog by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Browser test Created 6 years, 6 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
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 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. 1455 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing.
1456 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. 1456 // TODO(mgiuca): Remove the #if when Aura is the default on Linux.
1457 "enable-app-list", 1457 "enable-app-list",
1458 IDS_FLAGS_ENABLE_APP_LIST_NAME, 1458 IDS_FLAGS_ENABLE_APP_LIST_NAME,
1459 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, 1459 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION,
1460 kOsLinux, 1460 kOsLinux,
1461 SINGLE_VALUE_TYPE(switches::kEnableAppList) 1461 SINGLE_VALUE_TYPE(switches::kEnableAppList)
1462 }, 1462 },
1463 #endif 1463 #endif
1464 { 1464 {
1465 "disable-app-list-app-info",
1466 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1467 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1468 kOsLinux | kOsWin | kOsCrOS,
1469 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1470 },
1471 {
1465 "disable-app-list-voice-search", 1472 "disable-app-list-voice-search",
1466 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, 1473 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1467 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, 1474 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1468 kOsCrOS, 1475 kOsCrOS,
1469 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) 1476 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1470 }, 1477 },
1471 {
1472 "enable-app-list-app-info",
1473 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST,
1474 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1475 kOsLinux | kOsWin | kOsCrOS,
1476 SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo)
1477 },
1478 #endif 1478 #endif
1479 #if defined(OS_ANDROID) 1479 #if defined(OS_ANDROID)
1480 { 1480 {
1481 "enable-accessibility-tab-switcher", 1481 "enable-accessibility-tab-switcher",
1482 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1482 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1483 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1483 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1484 kOsAndroid, 1484 kOsAndroid,
1485 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1485 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1486 }, 1486 },
1487 { 1487 {
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2402 } 2402 }
2403 2403
2404 const Experiment* GetExperiments(size_t* count) { 2404 const Experiment* GetExperiments(size_t* count) {
2405 *count = num_experiments; 2405 *count = num_experiments;
2406 return experiments; 2406 return experiments;
2407 } 2407 }
2408 2408
2409 } // namespace testing 2409 } // namespace testing
2410 2410
2411 } // namespace about_flags 2411 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/app_list/app_list_service_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698