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

Unified Diff: chrome/browser/ui/extensions/shell_window.cc

Issue 10387155: Web Intents: Remove the flag and compile-time define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 55e63ecb74e6daca944ec1f4550c5ffca706faa4..be97abdc24086bab77fd8fcf9cd88b176e987516 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -162,8 +162,6 @@ bool ShellWindow::ShouldSuppressDialogs() {
void ShellWindow::WebIntentDispatch(
content::WebContents* web_contents,
content::WebIntentsDispatcher* intents_dispatcher) {
-
-#if defined(ENABLE_WEB_INTENTS)
if (!web_intents::IsWebIntentsEnabled(profile_))
return;
@@ -172,8 +170,7 @@ void ShellWindow::WebIntentDispatch(
contents_wrapper_->web_intent_picker_controller()->ShowDialog(
intents_dispatcher->GetIntent().action,
intents_dispatcher->GetIntent().type);
-#endif // defined(ENABLE_WEB_INTENTS)
- }
+}
void ShellWindow::Observe(int type,
const content::NotificationSource& source,
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698