Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 12096004: Made --enable-rich-notifications flag available to message_center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased + fixed build issue. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/notifications/message_center_notifications_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/surface/surface_switches.h" 33 #include "ui/surface/surface_switches.h"
34 34
35 #if defined(ENABLE_MESSAGE_CENTER)
36 #include "ui/message_center/message_center_switches.h"
37 #endif
38
35 #if defined(USE_ASH) 39 #if defined(USE_ASH)
36 #include "ash/ash_switches.h" 40 #include "ash/ash_switches.h"
37 #endif 41 #endif
38 42
39 #if defined(USE_AURA) 43 #if defined(USE_AURA)
40 #include "ui/aura/aura_switches.h" 44 #include "ui/aura/aura_switches.h"
41 #endif 45 #endif
42 46
43 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
44 #include "chromeos/chromeos_switches.h" 48 #include "chromeos/chromeos_switches.h"
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 kOsWin | kOsCrOS, 1224 kOsWin | kOsCrOS,
1221 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) 1225 SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop)
1222 }, 1226 },
1223 { 1227 {
1224 "load-cloud-policy-on-signin", 1228 "load-cloud-policy-on-signin",
1225 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME, 1229 IDS_FLAGS_DESKTOP_CLOUD_POLICY_NAME,
1226 IDS_FLAGS_DESKTOP_CLOUD_POLICY_DESCRIPTION, 1230 IDS_FLAGS_DESKTOP_CLOUD_POLICY_DESCRIPTION,
1227 kOsWin | kOsMac | kOsLinux, 1231 kOsWin | kOsMac | kOsLinux,
1228 SINGLE_VALUE_TYPE(switches::kLoadCloudPolicyOnSignin) 1232 SINGLE_VALUE_TYPE(switches::kLoadCloudPolicyOnSignin)
1229 }, 1233 },
1234 #if defined(ENABLE_MESSAGE_CENTER)
1230 { 1235 {
1231 "enable-rich-notifications", 1236 "enable-rich-notifications",
1232 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, 1237 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME,
1233 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, 1238 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION,
1234 kOsWin | kOsCrOS, 1239 kOsWin | kOsCrOS,
1235 SINGLE_VALUE_TYPE(switches::kEnableRichNotifications) 1240 SINGLE_VALUE_TYPE(message_center::switches::kEnableRichNotifications)
1236 }, 1241 },
1242 #endif
1237 { 1243 {
1238 "full-history-sync", 1244 "full-history-sync",
1239 IDS_FLAGS_FULL_HISTORY_SYNC_NAME, 1245 IDS_FLAGS_FULL_HISTORY_SYNC_NAME,
1240 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION, 1246 IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION,
1241 kOsAll, 1247 kOsAll,
1242 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync) 1248 SINGLE_VALUE_TYPE(switches::kHistoryEnableFullHistorySync)
1243 }, 1249 },
1244 { 1250 {
1245 "enable-data-channels", 1251 "enable-data-channels",
1246 IDS_FLAGS_RTC_DATACHANNELS, 1252 IDS_FLAGS_RTC_DATACHANNELS,
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 } 1690 }
1685 1691
1686 const Experiment* GetExperiments(size_t* count) { 1692 const Experiment* GetExperiments(size_t* count) {
1687 *count = num_experiments; 1693 *count = num_experiments;
1688 return experiments; 1694 return experiments;
1689 } 1695 }
1690 1696
1691 } // namespace testing 1697 } // namespace testing
1692 1698
1693 } // namespace about_flags 1699 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/message_center_notifications_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698