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

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

Issue 13940006: Remove --show-app-list-shortcut flag and implement new app launcher enable logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 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 <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <iterator> 10 #include <iterator>
11 #include <map> 11 #include <map>
12 #include <set> 12 #include <set>
13 #include <utility> 13 #include <utility>
14 14
15 #include "apps/switches.h"
16 #include "base/command_line.h" 15 #include "base/command_line.h"
17 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
18 #include "base/prefs/pref_service.h" 17 #include "base/prefs/pref_service.h"
19 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
20 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
21 #include "base/values.h" 20 #include "base/values.h"
22 #include "cc/base/switches.h" 21 #include "cc/base/switches.h"
23 #include "chrome/browser/prefs/scoped_user_pref_update.h" 22 #include "chrome/browser/prefs/scoped_user_pref_update.h"
24 #include "chrome/common/chrome_content_client.h" 23 #include "chrome/common/chrome_content_client.h"
25 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 SINGLE_VALUE_TYPE(switches::kPerformanceMonitorGathering) 1189 SINGLE_VALUE_TYPE(switches::kPerformanceMonitorGathering)
1191 }, 1190 },
1192 { 1191 {
1193 "disable-native-autofill-ui", 1192 "disable-native-autofill-ui",
1194 IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_NAME, 1193 IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_NAME,
1195 IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_DESCRIPTION, 1194 IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_DESCRIPTION,
1196 kOsDesktop, 1195 kOsDesktop,
1197 SINGLE_VALUE_TYPE(switches::kDisableNativeAutofillUi) 1196 SINGLE_VALUE_TYPE(switches::kDisableNativeAutofillUi)
1198 }, 1197 },
1199 { 1198 {
1200 "show-app-list-shortcut",
1201 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_NAME,
1202 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_DESCRIPTION,
1203 kOsWin,
1204 SINGLE_VALUE_TYPE(apps::switches::kShowAppListShortcut)
1205 },
1206 {
1207 "enable-experimental-form-filling", 1199 "enable-experimental-form-filling",
1208 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_NAME, 1200 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_NAME,
1209 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_DESCRIPTION, 1201 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_DESCRIPTION,
1210 kOsWin | kOsCrOS, 1202 kOsWin | kOsCrOS,
1211 SINGLE_VALUE_TYPE(autofill::switches::kEnableExperimentalFormFilling) 1203 SINGLE_VALUE_TYPE(autofill::switches::kEnableExperimentalFormFilling)
1212 }, 1204 },
1213 { 1205 {
1214 "wallet-service-use-prod", 1206 "wallet-service-use-prod",
1215 IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_NAME, 1207 IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_NAME,
1216 IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_DESCRIPTION, 1208 IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_DESCRIPTION,
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1844 } 1836 }
1845 1837
1846 const Experiment* GetExperiments(size_t* count) { 1838 const Experiment* GetExperiments(size_t* count) {
1847 *count = num_experiments; 1839 *count = num_experiments;
1848 return experiments; 1840 return experiments;
1849 } 1841 }
1850 1842
1851 } // namespace testing 1843 } // namespace testing
1852 1844
1853 } // namespace about_flags 1845 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698