Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

Unified Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing static initializer Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 eab497bb54bf754c5b3b0463288619af6af872ae..7046ee37da4d160b2ea5a61f04c60609297a89ee 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -29,13 +29,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
@@ -112,11 +109,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
#if defined(OS_CHROMEOS)
if (ash::switches::UseNewAudioHandler()) {
@@ -154,11 +149,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
#if defined(OS_CHROMEOS)
if (ash::switches::UseNewAudioHandler())
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698