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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 13533019: Disables HTML notifications when rich notifications are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Indentation in test fixed. Created 7 years, 8 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 | chrome/browser/extensions/notifications_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 08fae2a991502a816dfea7c47c91cf56f88de6b3..3c518fb02a99b8fe38e248fbd93bb4e1b1bfebae 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -156,6 +156,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
@@ -1192,6 +1196,11 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
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[] = {
switches::kAllowRequestOSFileHandleAPI,
« no previous file with comments | « no previous file | chrome/browser/extensions/notifications_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698