Index: ash/shell/content_client/shell_browser_main_parts.cc |
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc |
index b2393e67375bda34a5bd727f1cc9faf797d42ad7..a6927750fe116f9e6c9e6ace6b46733da1bc15e1 100644 |
--- a/ash/shell/content_client/shell_browser_main_parts.cc |
+++ b/ash/shell/content_client/shell_browser_main_parts.cc |
@@ -28,13 +28,10 @@ |
#include "ui/compositor/compositor.h" |
#include "ui/compositor/test/compositor_test_support.h" |
#include "ui/gfx/screen.h" |
+#include "ui/message_center/message_center.h" |
#include "ui/views/focus/accelerator_handler.h" |
#include "ui/views/test/test_views_delegate.h" |
-#if defined(ENABLE_MESSAGE_CENTER) |
-#include "ui/message_center/message_center.h" |
-#endif |
- |
#if defined(USE_X11) |
#include "ui/base/touch/touch_factory_x11.h" |
#endif |
@@ -109,11 +106,9 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { |
views::ViewsDelegate::views_delegate = new ShellViewsDelegate; |
delegate_ = new ash::shell::ShellDelegateImpl; |
-#if defined(ENABLE_MESSAGE_CENTER) |
// The global message center state must be initialized absent |
// g_browser_process. |
message_center::MessageCenter::Initialize(); |
-#endif |
ash::Shell::CreateInstance(delegate_); |
ash::Shell::GetInstance()->set_browser_context(browser_context_.get()); |
@@ -142,11 +137,9 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { |
delegate_->SetWatcher(NULL); |
delegate_ = NULL; |
ash::Shell::DeleteInstance(); |
-#if defined(ENABLE_MESSAGE_CENTER) |
// The global message center state must be shutdown absent |
// g_browser_process. |
message_center::MessageCenter::Shutdown(); |
-#endif |
aura::Env::DeleteInstance(); |
// The keyboard may have created a WebContents. The WebContents is destroyed |