diff options
| author | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:23:21 +0000 |
|---|---|---|
| committer | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 19:23:21 +0000 |
| commit | bce52eaa760e4a43b96c69e92b18af204c04546e (patch) | |
| tree | 399322f3b98819a58a6612075a70e8c0d7de8533 /ash/test/ash_test_helper.cc | |
| parent | f09aea144a06f650ec6531414b75fabd5bc0950f (diff) | |
| download | chromium_src-bce52eaa760e4a43b96c69e92b18af204c04546e.zip chromium_src-bce52eaa760e4a43b96c69e92b18af204c04546e.tar.gz chromium_src-bce52eaa760e4a43b96c69e92b18af204c04546e.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
Review URL: https://chromiumcodereview.appspot.com/15025002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index c95fe28..a2fb390f 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -14,11 +14,7 @@ #include "ui/aura/env.h" #include "ui/base/ime/text_input_test_support.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" - - -#if defined(ENABLE_MESSAGE_CENTER) #include "ui/message_center/message_center.h" -#endif namespace ash { namespace test { @@ -45,11 +41,9 @@ void AshTestHelper::SetUp() { // Creates Shell and hook with Desktop. test_shell_delegate_ = new TestShellDelegate; -#if defined(ENABLE_MESSAGE_CENTER) // Creates MessageCenter since g_browser_process is not created in AshTestBase // tests. message_center::MessageCenter::Initialize(); -#endif ash::Shell::CreateInstance(test_shell_delegate_); Shell* shell = Shell::GetInstance(); test::DisplayManagerTestApi(shell->display_manager()). @@ -62,10 +56,8 @@ void AshTestHelper::TearDown() { // Tear down the shell. Shell::DeleteInstance(); -#if defined(ENABLE_MESSAGE_CENTER) // Remove global message center state. message_center::MessageCenter::Shutdown(); -#endif aura::Env::DeleteInstance(); ui::TextInputTestSupport::Shutdown(); |