summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-12 23:08:56 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-12 23:08:56 +0000
commit9a22457f69b4cddf6a360559f0663e51fc5ab9c5 (patch)
tree967b7c63bca70dfa1efae86d1c9c0caa559a7c61 /chrome/browser/about_flags.cc
parent24b12e5ba96d93ab90314d89e43148d52aa3c3f4 (diff)
downloadchromium_src-9a22457f69b4cddf6a360559f0663e51fc5ab9c5.zip
chromium_src-9a22457f69b4cddf6a360559f0663e51fc5ab9c5.tar.gz
chromium_src-9a22457f69b4cddf6a360559f0663e51fc5ab9c5.tar.bz2
Revert 199625 "Remove ENABLE_MESSAGE_CENTER"
Caused a static initializer on Linux: # message_center_constants.cc __i686.get_pc_thunk.cx (Not on Mac though. The SkGetColor() macro has a comment about it not adding a static initializer on release builds, so maybe it's the float-int-multiplication? I don't have a linux box around to check, sorry.) > Remove ENABLE_MESSAGE_CENTER > > Next step on re-factoring Notifications. This will bring the MessageCenter classes, most important message_center::Notification, into build on all systems, including those where the MessageCenter is not yet appearign in UI. This will allow to start using this Notification class in client code and remove the old Notification class defined in chrome/browser/notificaitons/notification.h > > That will allow the clients that already use Rich Notifications to use richer data type support, for example supply an image bits for a Notification (as in Snapshot notifications). > > This also removes a lot of compile-time @ifdefs and replaces them with checking a runtime flag which we already have anyways. > > On Android and iOS, the MessageCenter is not compiled in, for the size concerns and uncertain story for notifications in general - the existing ENABLE_NOTIFICATIONS define is used for that. > > BUG=174164 > > Review URL: https://chromiumcodereview.appspot.com/15025002 TBR=dimich@chromium.org Review URL: https://codereview.chromium.org/14631021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
-rw-r--r--chrome/browser/about_flags.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a6685b9..3ed9a38 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -32,9 +32,12 @@
#include "ui/gfx/switches.h"
#include "ui/gl/gl_switches.h"
#include "ui/keyboard/keyboard_switches.h"
-#include "ui/message_center/message_center_switches.h"
#include "ui/surface/surface_switches.h"
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center_switches.h"
+#endif
+
#if defined(USE_ASH)
#include "ash/ash_switches.h"
#endif
@@ -1294,6 +1297,7 @@ const Experiment kExperiments[] = {
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing,
switches::kDisableTouchEditing)
},
+#if defined(ENABLE_MESSAGE_CENTER)
{
"enable-rich-notifications",
IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME,
@@ -1303,6 +1307,7 @@ const Experiment kExperiments[] = {
message_center::switches::kEnableRichNotifications,
message_center::switches::kDisableRichNotifications)
},
+#endif
{
"enable-sync-synced-notifications",
IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME,