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 12 matching lines...) Expand all Loading... | |
23 #include "content/public/browser/user_metrics.h" | 23 #include "content/public/browser/user_metrics.h" |
24 #include "grit/chromium_strings.h" | 24 #include "grit/chromium_strings.h" |
25 #include "grit/generated_resources.h" | 25 #include "grit/generated_resources.h" |
26 #include "grit/google_chrome_strings.h" | 26 #include "grit/google_chrome_strings.h" |
27 #include "media/base/media_switches.h" | 27 #include "media/base/media_switches.h" |
28 #include "ui/app_list/app_list_switches.h" | 28 #include "ui/app_list/app_list_switches.h" |
29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
30 #include "ui/base/ui_base_switches.h" | 30 #include "ui/base/ui_base_switches.h" |
31 #include "ui/gfx/switches.h" | 31 #include "ui/gfx/switches.h" |
32 #include "ui/gl/gl_switches.h" | 32 #include "ui/gl/gl_switches.h" |
33 #include "ui/message_center/message_center_switches.h" | |
Jun Mukai
2013/01/26 02:52:52
#if defined(ENABLE_MESSAGE_CENTER) is needed here
dharcourt
2013/01/26 04:07:04
Done.
| |
33 | 34 |
34 #if defined(USE_ASH) | 35 #if defined(USE_ASH) |
35 #include "ash/ash_switches.h" | 36 #include "ash/ash_switches.h" |
36 #endif | 37 #endif |
37 | 38 |
38 #if defined(USE_AURA) | 39 #if defined(USE_AURA) |
39 #include "ui/aura/aura_switches.h" | 40 #include "ui/aura/aura_switches.h" |
40 #endif | 41 #endif |
41 | 42 |
42 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1189 kOsWin | kOsCrOS, | 1190 kOsWin | kOsCrOS, |
1190 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) | 1191 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) |
1191 }, | 1192 }, |
1192 { | 1193 { |
1193 "load-cloud-policy-on-signin", | 1194 "load-cloud-policy-on-signin", |
1194 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, | 1195 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, |
1195 IDS_FLAGS_DESKTOP_CLOUD_POLICY_DESCRIPTION, | 1196 IDS_FLAGS_DESKTOP_CLOUD_POLICY_DESCRIPTION, |
1196 kOsWin | kOsMac | kOsLinux, | 1197 kOsWin | kOsMac | kOsLinux, |
1197 SINGLE_VALUE_TYPE(switches::kLoadCloudPolicyOnSignin) | 1198 SINGLE_VALUE_TYPE(switches::kLoadCloudPolicyOnSignin) |
1198 }, | 1199 }, |
1199 { | 1200 { |
Jun Mukai
2013/01/26 02:52:52
also ENABLE_MESSAGE_CENTER here
dharcourt
2013/01/26 04:07:04
Done.
| |
1200 "enable-rich-notifications", | 1201 "enable-rich-notifications", |
1201 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, | 1202 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, |
1202 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, | 1203 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, |
1203 kOsWin | kOsCrOS, | 1204 kOsWin | kOsCrOS, |
1204 SINGLE_VALUE_TYPE(switches::kEnableRichNotifications) | 1205 SINGLE_VALUE_TYPE(message_center::switches::kEnableRichNotifications) |
1205 }, | 1206 }, |
1206 { | 1207 { |
1207 "full-history-sync", | 1208 "full-history-sync", |
1208 IDS_FLAGS_FULL_HISTORY_SYNC_NAME, | 1209 IDS_FLAGS_FULL_HISTORY_SYNC_NAME, |
1209 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION, | 1210 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION, |
1210 kOsAll, | 1211 kOsAll, |
1211 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) | 1212 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) |
1212 }, | 1213 }, |
1213 { | 1214 { |
1214 "enable-data-channels", | 1215 "enable-data-channels", |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1653 } | 1654 } |
1654 | 1655 |
1655 const Experiment* GetExperiments(size_t* count) { | 1656 const Experiment* GetExperiments(size_t* count) { |
1656 *count = num_experiments; | 1657 *count = num_experiments; |
1657 return experiments; | 1658 return experiments; |
1658 } | 1659 } |
1659 | 1660 |
1660 } // namespace testing | 1661 } // namespace testing |
1661 | 1662 |
1662 } // namespace about_flags | 1663 } // namespace about_flags |
OLD | NEW |