summaryrefslogtreecommitdiffstats
path: root/ui/message_center
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 11:59:59 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 11:59:59 +0000
commitf4fb842e2280e080a15e5bf5a81ac4de5ff913e1 (patch)
treeac1e150a4a9260159ee81a2640b0ed0be77dc6a8 /ui/message_center
parent812dc6f68c60914b75ae9fb4b8ef7b9803c3a8a1 (diff)
downloadchromium_src-f4fb842e2280e080a15e5bf5a81ac4de5ff913e1.zip
chromium_src-f4fb842e2280e080a15e5bf5a81ac4de5ff913e1.tar.gz
chromium_src-f4fb842e2280e080a15e5bf5a81ac4de5ff913e1.tar.bz2
Start building message_center on Mac.
BUG=179904,179916 Review URL: https://codereview.chromium.org/12635010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
-rw-r--r--ui/message_center/message_center.gyp12
-rw-r--r--ui/message_center/message_center_tray.cc7
-rw-r--r--ui/message_center/message_center_tray_delegate.h2
-rw-r--r--ui/message_center/message_center_util.cc5
4 files changed, 25 insertions, 1 deletions
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
index bd8a07a9..00139ec 100644
--- a/ui/message_center/message_center.gyp
+++ b/ui/message_center/message_center.gyp
@@ -20,7 +20,6 @@
'../compositor/compositor.gyp:compositor',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
- '../views/views.gyp:views',
],
'defines': [
'MESSAGE_CENTER_IMPLEMENTATION',
@@ -66,6 +65,17 @@
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
+ 'conditions': [
+ ['toolkit_views==1', {
+ 'dependencies': [
+ '../views/views.gyp:views',
+ ],
+ }, {
+ 'sources/': [
+ ['exclude', 'views/'],
+ ],
+ }],
+ ],
},
{
'target_name': 'message_center_unittests',
diff --git a/ui/message_center/message_center_tray.cc b/ui/message_center/message_center_tray.cc
index 6f30df7..de9b1b89 100644
--- a/ui/message_center/message_center_tray.cc
+++ b/ui/message_center/message_center_tray.cc
@@ -20,6 +20,13 @@ const int kEnableQuietModeDay = 2;
}
+#if !defined(TOOLKIT_VIEWS)
+MESSAGE_CENTER_EXPORT MessageCenterTrayDelegate* CreateMessageCenterTray() {
+ NOTIMPLEMENTED();
+ return NULL;
+}
+#endif
+
MessageCenterTray::MessageCenterTray(
MessageCenterTrayDelegate* delegate,
message_center::MessageCenter* message_center)
diff --git a/ui/message_center/message_center_tray_delegate.h b/ui/message_center/message_center_tray_delegate.h
index edd31a3..18b89d3 100644
--- a/ui/message_center/message_center_tray_delegate.h
+++ b/ui/message_center/message_center_tray_delegate.h
@@ -5,6 +5,8 @@
#ifndef UI_MESSAGE_CENTER_MESSAGE_CENTER_TRAY_DELEGATE_H_
#define UI_MESSAGE_CENTER_MESSAGE_CENTER_TRAY_DELEGATE_H_
+#include "ui/message_center/message_center_export.h"
+
namespace message_center {
// A MessageCenterTrayDelegate class is responsible for managing the various UI
diff --git a/ui/message_center/message_center_util.cc b/ui/message_center/message_center_util.cc
index 3b1f1e7..de2a06f 100644
--- a/ui/message_center/message_center_util.cc
+++ b/ui/message_center/message_center_util.cc
@@ -13,7 +13,12 @@ namespace message_center {
// when a time period in Canary indicates the new notifications are acceptable
// for default behavior.
bool IsRichNotificationEnabled() {
+#if defined(OS_MACOSX)
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableRichNotifications);
+#else
return true;
+#endif
}
} // namespace message_center