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 7141d303e5a8462274ee4b954b396b3a73c476f6..7261f5ae4705ad6f5ebffafaaa0ca84826a07ae4 100644 |
--- a/chrome/browser/intents/web_intents_util.cc |
+++ b/chrome/browser/intents/web_intents_util.cc |
@@ -19,19 +19,24 @@ void RegisterUserPrefs(PrefService* user_prefs) { |
PrefService::SYNCABLE_PREF); |
} |
-bool IsWebIntentsEnabled() { |
+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; |
+} |
+ |
+bool IsWebIntentsEnabledInActiveBrowser() { |
Browser* browser = BrowserList::GetLastActive(); |
if (!browser) |
browser = *BrowserList::begin(); |
+ DCHECK(browser); |
Profile* profile = browser->GetProfile(); |
- bool enabled_pref = profile->GetPrefs()->GetBoolean( |
- prefs::kWebIntentsEnabled); |
- |
- return !disabled_flag && enabled_pref; |
+ return IsWebIntentsEnabled(profile); |
} |
} // namespace web_intents |