| 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> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "grit/chromium_strings.h" | 25 #include "grit/chromium_strings.h" |
| 26 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 27 #include "grit/google_chrome_strings.h" | 27 #include "grit/google_chrome_strings.h" |
| 28 #include "media/base/media_switches.h" | 28 #include "media/base/media_switches.h" |
| 29 #include "ui/app_list/app_list_switches.h" | 29 #include "ui/app_list/app_list_switches.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/ui_base_switches.h" | 31 #include "ui/base/ui_base_switches.h" |
| 32 #include "ui/gfx/switches.h" | 32 #include "ui/gfx/switches.h" |
| 33 #include "ui/gl/gl_switches.h" | 33 #include "ui/gl/gl_switches.h" |
| 34 #include "ui/keyboard/keyboard_switches.h" | 34 #include "ui/keyboard/keyboard_switches.h" |
| 35 #include "ui/message_center/message_center_switches.h" |
| 35 #include "ui/surface/surface_switches.h" | 36 #include "ui/surface/surface_switches.h" |
| 36 | 37 |
| 37 #if defined(ENABLE_MESSAGE_CENTER) | |
| 38 #include "ui/message_center/message_center_switches.h" | |
| 39 #endif | |
| 40 | |
| 41 #if defined(USE_ASH) | 38 #if defined(USE_ASH) |
| 42 #include "ash/ash_switches.h" | 39 #include "ash/ash_switches.h" |
| 43 #endif | 40 #endif |
| 44 | 41 |
| 45 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
| 46 #include "chromeos/chromeos_switches.h" | 43 #include "chromeos/chromeos_switches.h" |
| 47 #endif | 44 #endif |
| 48 | 45 |
| 49 using content::UserMetricsAction; | 46 using content::UserMetricsAction; |
| 50 | 47 |
| (...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1290 switches::kDisableTouchDragDrop) | 1287 switches::kDisableTouchDragDrop) |
| 1291 }, | 1288 }, |
| 1292 { | 1289 { |
| 1293 "enable-touch-editing", | 1290 "enable-touch-editing", |
| 1294 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1291 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| 1295 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1292 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| 1296 kOsCrOS, | 1293 kOsCrOS, |
| 1297 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1294 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| 1298 switches::kDisableTouchEditing) | 1295 switches::kDisableTouchEditing) |
| 1299 }, | 1296 }, |
| 1300 #if defined(ENABLE_MESSAGE_CENTER) | |
| 1301 { | 1297 { |
| 1302 "enable-rich-notifications", | 1298 "enable-rich-notifications", |
| 1303 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, | 1299 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, |
| 1304 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, | 1300 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, |
| 1305 kOsWin | kOsCrOS | kOsMac, | 1301 kOsWin | kOsCrOS | kOsMac, |
| 1306 ENABLE_DISABLE_VALUE_TYPE( | 1302 ENABLE_DISABLE_VALUE_TYPE( |
| 1307 message_center::switches::kEnableRichNotifications, | 1303 message_center::switches::kEnableRichNotifications, |
| 1308 message_center::switches::kDisableRichNotifications) | 1304 message_center::switches::kDisableRichNotifications) |
| 1309 }, | 1305 }, |
| 1310 #endif | |
| 1311 { | 1306 { |
| 1312 "enable-sync-synced-notifications", | 1307 "enable-sync-synced-notifications", |
| 1313 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, | 1308 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, |
| 1314 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, | 1309 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, |
| 1315 kOsWin | kOsCrOS, | 1310 kOsWin | kOsCrOS, |
| 1316 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, | 1311 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, |
| 1317 switches::kDisableSyncSyncedNotifications) | 1312 switches::kDisableSyncSyncedNotifications) |
| 1318 }, | 1313 }, |
| 1319 { | 1314 { |
| 1320 "disable-full-history-sync", | 1315 "disable-full-history-sync", |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1960 } | 1955 } |
| 1961 | 1956 |
| 1962 const Experiment* GetExperiments(size_t* count) { | 1957 const Experiment* GetExperiments(size_t* count) { |
| 1963 *count = num_experiments; | 1958 *count = num_experiments; |
| 1964 return experiments; | 1959 return experiments; |
| 1965 } | 1960 } |
| 1966 | 1961 |
| 1967 } // namespace testing | 1962 } // namespace testing |
| 1968 | 1963 |
| 1969 } // namespace about_flags | 1964 } // namespace about_flags |
| OLD | NEW |