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

Unified Diff: chrome/browser/intents/web_intents_util.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/content_settings/host_content_settings_map.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/intents/web_intents_util.cc
diff --git a/chrome/browser/intents/web_intents_util.cc b/chrome/browser/intents/web_intents_util.cc
index 9457e4cdfacd04e47b27310e0e90404b34ac42d3..ea6fc2274c63eb6c3c803a18a3cff9db269ab6db 100644
--- a/chrome/browser/intents/web_intents_util.cc
+++ b/chrome/browser/intents/web_intents_util.cc
@@ -20,13 +20,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
}
bool IsWebIntentsEnabled(Profile* profile) {
- bool disabled_flag = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableWebIntents);
-
- bool enabled_pref = profile->GetPrefs()->GetBoolean(
- prefs::kWebIntentsEnabled);
-
- return !disabled_flag && enabled_pref;
+ return profile->GetPrefs()->GetBoolean(prefs::kWebIntentsEnabled);
}
bool IsWebIntentsEnabledInActiveBrowser() {
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698