| 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 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1256 #endif | 1257 #endif |
| 1257 #if defined(ENABLE_GOOGLE_NOW) | 1258 #if defined(ENABLE_GOOGLE_NOW) |
| 1258 { | 1259 { |
| 1259 "enable-google-now", | 1260 "enable-google-now", |
| 1260 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, | 1261 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME, |
| 1261 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, | 1262 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION, |
| 1262 kOsWin | kOsCrOS, | 1263 kOsWin | kOsCrOS, |
| 1263 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) | 1264 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration) |
| 1264 }, | 1265 }, |
| 1265 #endif | 1266 #endif |
| 1267 #if defined(OS_CHROMEOS) |
| 1268 { |
| 1269 "enable-virtual-keyboard", |
| 1270 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME, |
| 1271 IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION, |
| 1272 kOsCrOS, |
| 1273 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard) |
| 1274 }, |
| 1275 #endif |
| 1266 }; | 1276 }; |
| 1267 | 1277 |
| 1268 const Experiment* experiments = kExperiments; | 1278 const Experiment* experiments = kExperiments; |
| 1269 size_t num_experiments = arraysize(kExperiments); | 1279 size_t num_experiments = arraysize(kExperiments); |
| 1270 | 1280 |
| 1271 // Stores and encapsulates the little state that about:flags has. | 1281 // Stores and encapsulates the little state that about:flags has. |
| 1272 class FlagsState { | 1282 class FlagsState { |
| 1273 public: | 1283 public: |
| 1274 FlagsState() : needs_restart_(false) {} | 1284 FlagsState() : needs_restart_(false) {} |
| 1275 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 1285 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1756 } | 1766 } |
| 1757 | 1767 |
| 1758 const Experiment* GetExperiments(size_t* count) { | 1768 const Experiment* GetExperiments(size_t* count) { |
| 1759 *count = num_experiments; | 1769 *count = num_experiments; |
| 1760 return experiments; | 1770 return experiments; |
| 1761 } | 1771 } |
| 1762 | 1772 |
| 1763 } // namespace testing | 1773 } // namespace testing |
| 1764 | 1774 |
| 1765 } // namespace about_flags | 1775 } // namespace about_flags |
| OLD | NEW |