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 <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <iterator> | 10 #include <iterator> |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "content/public/browser/user_metrics.h" | 28 #include "content/public/browser/user_metrics.h" |
29 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
30 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
31 #include "grit/google_chrome_strings.h" | 31 #include "grit/google_chrome_strings.h" |
32 #include "media/base/media_switches.h" | 32 #include "media/base/media_switches.h" |
33 #include "ui/app_list/app_list_switches.h" | 33 #include "ui/app_list/app_list_switches.h" |
34 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
35 #include "ui/base/ui_base_switches.h" | 35 #include "ui/base/ui_base_switches.h" |
36 #include "ui/gfx/switches.h" | 36 #include "ui/gfx/switches.h" |
37 #include "ui/gl/gl_switches.h" | 37 #include "ui/gl/gl_switches.h" |
| 38 #include "ui/keyboard/keyboard_switches.h" |
38 #include "ui/surface/surface_switches.h" | 39 #include "ui/surface/surface_switches.h" |
39 | 40 |
40 #if defined(ENABLE_MESSAGE_CENTER) | 41 #if defined(ENABLE_MESSAGE_CENTER) |
41 #include "ui/message_center/message_center_switches.h" | 42 #include "ui/message_center/message_center_switches.h" |
42 #endif | 43 #endif |
43 | 44 |
44 #if defined(USE_ASH) | 45 #if defined(USE_ASH) |
45 #include "ash/ash_switches.h" | 46 #include "ash/ash_switches.h" |
46 #endif | 47 #endif |
47 | 48 |
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1301 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) | 1302 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) |
1302 }, | 1303 }, |
1303 #endif | 1304 #endif |
1304 { | 1305 { |
1305 "enable-translate-alpha-languages", | 1306 "enable-translate-alpha-languages", |
1306 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_NAME, | 1307 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_NAME, |
1307 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_DESCRIPTION, | 1308 IDS_FLAGS_ENABLE_TRANSLATE_ALPHA_LANGUAGES_DESCRIPTION, |
1308 kOsAll, | 1309 kOsAll, |
1309 SINGLE_VALUE_TYPE(switches::kEnableTranslateAlphaLanguages) | 1310 SINGLE_VALUE_TYPE(switches::kEnableTranslateAlphaLanguages) |
1310 }, | 1311 }, |
| 1312 #if defined(OS_CHROMEOS) |
| 1313 { |
| 1314 "enable-virtual-keyboard", |
| 1315 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
| 1316 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
| 1317 kOsCrOS, |
| 1318 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) |
| 1319 }, |
| 1320 #endif |
1311 }; | 1321 }; |
1312 | 1322 |
1313 const Experiment* experiments = kExperiments; | 1323 const Experiment* experiments = kExperiments; |
1314 size_t num_experiments = arraysize(kExperiments); | 1324 size_t num_experiments = arraysize(kExperiments); |
1315 | 1325 |
1316 // Stores and encapsulates the little state that about:flags has. | 1326 // Stores and encapsulates the little state that about:flags has. |
1317 class FlagsState { | 1327 class FlagsState { |
1318 public: | 1328 public: |
1319 FlagsState() : needs_restart_(false) {} | 1329 FlagsState() : needs_restart_(false) {} |
1320 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 1330 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1801 } | 1811 } |
1802 | 1812 |
1803 const Experiment* GetExperiments(size_t* count) { | 1813 const Experiment* GetExperiments(size_t* count) { |
1804 *count = num_experiments; | 1814 *count = num_experiments; |
1805 return experiments; | 1815 return experiments; |
1806 } | 1816 } |
1807 | 1817 |
1808 } // namespace testing | 1818 } // namespace testing |
1809 | 1819 |
1810 } // namespace about_flags | 1820 } // namespace about_flags |
OLD | NEW |