OLD | NEW |
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> |
11 #include <utility> | 11 #include <utility> |
12 | 12 |
| 13 #include "apps/switches.h" |
13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
14 #include "base/memory/singleton.h" | 15 #include "base/memory/singleton.h" |
15 #include "base/prefs/pref_service.h" | 16 #include "base/prefs/pref_service.h" |
16 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
17 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
18 #include "base/values.h" | 19 #include "base/values.h" |
19 #include "cc/switches.h" | 20 #include "cc/switches.h" |
20 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 21 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
21 #include "chrome/common/chrome_content_client.h" | 22 #include "chrome/common/chrome_content_client.h" |
22 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1172 IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_NAME, | 1173 IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_NAME, |
1173 IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_DESCRIPTION, | 1174 IDS_FLAGS_ENABLE_NEW_AUTOFILL_UI_DESCRIPTION, |
1174 kOsDesktop, | 1175 kOsDesktop, |
1175 SINGLE_VALUE_TYPE(switches::kEnableNewAutofillUi) | 1176 SINGLE_VALUE_TYPE(switches::kEnableNewAutofillUi) |
1176 }, | 1177 }, |
1177 { | 1178 { |
1178 "show-app-list-shortcut", | 1179 "show-app-list-shortcut", |
1179 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_NAME, | 1180 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_NAME, |
1180 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_DESCRIPTION, | 1181 IDS_FLAGS_SHOW_APP_LIST_SHORTCUT_DESCRIPTION, |
1181 kOsWin, | 1182 kOsWin, |
1182 SINGLE_VALUE_TYPE(switches::kShowAppListShortcut) | 1183 SINGLE_VALUE_TYPE(apps::switches::kShowAppListShortcut) |
1183 }, | 1184 }, |
1184 { | 1185 { |
1185 "enable-experimental-form-filling", | 1186 "enable-experimental-form-filling", |
1186 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_NAME, | 1187 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_NAME, |
1187 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_DESCRIPTION, | 1188 IDS_FLAGS_ENABLE_EXPERIMENTAL_FORM_FILLING_DESCRIPTION, |
1188 kOsWin | kOsCrOS, | 1189 kOsWin | kOsCrOS, |
1189 SINGLE_VALUE_TYPE(switches::kEnableExperimentalFormFilling) | 1190 SINGLE_VALUE_TYPE(switches::kEnableExperimentalFormFilling) |
1190 }, | 1191 }, |
1191 { | 1192 { |
1192 "enable-interactive-autocomplete", | 1193 "enable-interactive-autocomplete", |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1747 } | 1748 } |
1748 | 1749 |
1749 const Experiment* GetExperiments(size_t* count) { | 1750 const Experiment* GetExperiments(size_t* count) { |
1750 *count = num_experiments; | 1751 *count = num_experiments; |
1751 return experiments; | 1752 return experiments; |
1752 } | 1753 } |
1753 | 1754 |
1754 } // namespace testing | 1755 } // namespace testing |
1755 | 1756 |
1756 } // namespace about_flags | 1757 } // namespace about_flags |
OLD | NEW |