diff options
| author | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 05:30:24 +0000 |
|---|---|---|
| committer | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 05:30:24 +0000 |
| commit | fb1aac14e2833d6ba5b9d9ba61a964a6eb26f180 (patch) | |
| tree | 3ec59087d20b1bded6b25484dbc7558a6957b76f /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | 25c2f0dd9ae9c7f8db2527dd72e3cbb45666c57e (diff) | |
| download | chromium_src-fb1aac14e2833d6ba5b9d9ba61a964a6eb26f180.zip chromium_src-fb1aac14e2833d6ba5b9d9ba61a964a6eb26f180.tar.gz chromium_src-fb1aac14e2833d6ba5b9d9ba61a964a6eb26f180.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=199625
Review URL: https://chromiumcodereview.appspot.com/15025002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index 50caecc..dbf7e1c 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -15,10 +15,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/common/show_desktop_notification_params.h" - -#if defined(ENABLE_MESSAGE_CENTER) #include "ui/message_center/message_center.h" -#endif #if defined(USE_ASH) #include "ash/shell.h" @@ -116,11 +113,9 @@ void DesktopNotificationsTest::SetUp() { WebKit::initialize(webkit_platform_support_.Get()); ui::ScopedAnimationDurationScaleMode normal_duration_mode( ui::ScopedAnimationDurationScaleMode::ZERO_DURATION); -#if defined(ENABLE_MESSAGE_CENTER) // The message center is notmally initialized on |g_browser_process| which // is not created for these tests. message_center::MessageCenter::Initialize(); -#endif // MockBalloonCollection retrieves information about the screen on creation. // So it is necessary to make sure the desktop gets created first. ash::Shell::CreateInstance(new ash::test::TestShellDelegate); @@ -143,11 +138,9 @@ void DesktopNotificationsTest::TearDown() { #if defined(USE_ASH) active_desktop_monitor_.reset(); ash::Shell::DeleteInstance(); -#if defined(ENABLE_MESSAGE_CENTER) // The message center is notmally shutdown on |g_browser_process| which // is not created for these tests. message_center::MessageCenter::Shutdown(); -#endif aura::Env::DeleteInstance(); WebKit::shutdown(); #endif |