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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/chrome_content_browser_client.cc

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/chrome/browser/browser_process_impl.cc ('k') | trunk/src/chrome/browser/extensions/api/notifications/notifications_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chrome_content_browser_client.cc
===================================================================
--- trunk/src/chrome/browser/chrome_content_browser_client.cc (revision 199638)
+++ trunk/src/chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -128,7 +128,6 @@
#include "ppapi/host/ppapi_host.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/message_center/message_center_util.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/plugins/plugin_switches.h"
@@ -163,6 +162,10 @@
#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
#endif
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center_util.h"
+#endif
+
#if defined(OS_ANDROID)
#include "ui/base/ui_base_paths.h"
#endif
@@ -1224,8 +1227,10 @@
if (content::IsThreadedCompositingEnabled())
command_line->AppendSwitch(switches::kEnableThreadedCompositing);
+#if defined(ENABLE_MESSAGE_CENTER)
if (message_center::IsRichNotificationEnabled())
command_line->AppendSwitch(switches::kDisableHTMLNotifications);
+#endif
// Please keep this in alphabetical order.
static const char* const kSwitchNames[] = {
« no previous file with comments | « trunk/src/chrome/browser/browser_process_impl.cc ('k') | trunk/src/chrome/browser/extensions/api/notifications/notifications_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698