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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 6992081: Make --allow-cross-domain-auth-prompt equivalent to a preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
Index: chrome/browser/browser_process_impl.cc
===================================================================
--- chrome/browser/browser_process_impl.cc (revision 86721)
+++ chrome/browser/browser_process_impl.cc (working copy)
@@ -672,12 +672,15 @@
ShellIntegration::SetAsDefaultBrowser();
} else if (*pref == prefs::kDisabledSchemes) {
ApplyDisabledSchemesPolicy();
+ } else if (*pref == prefs::kAllowCrossOriginAuthPrompt) {
+ ApplyAllowCrossOriginAuthPromptPolicy();
}
} else {
NOTREACHED();
}
}
+
Mattias Nissler (ping if slow) 2011/05/26 09:55:51 excess whitespace
void BrowserProcessImpl::WaitForPluginDataRemoverToFinish() {
if (plugin_data_remover_.get())
plugin_data_remover_->Wait();
@@ -744,6 +747,8 @@
new ChromeResourceDispatcherHostObserver(prerender_tracker()));
resource_dispatcher_host_->set_observer(
resource_dispatcher_host_observer_.get());
+
+ ApplyAllowCrossOriginAuthPromptPolicy();
}
void BrowserProcessImpl::CreateMetricsService() {
@@ -944,6 +949,11 @@
local_state_->RegisterListPref(prefs::kDisabledSchemes);
pref_change_registrar_.Add(prefs::kDisabledSchemes, this);
ApplyDisabledSchemesPolicy();
+
+ // Chrome must tell code under content/ to change behavior, since content
+ // doesn't know about prefs.
+ local_state_->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false);
Mattias Nissler (ping if slow) 2011/05/26 09:55:51 Doing ad hoc pref registration is nowadays discour
+ pref_change_registrar_.Add(prefs::kAllowCrossOriginAuthPrompt, this);
}
void BrowserProcessImpl::CreateIconManager() {
@@ -1051,6 +1061,11 @@
ChildProcessSecurityPolicy::GetInstance()->RegisterDisabledSchemes(schemes);
}
+void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() {
+ bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt);
+ resource_dispatcher_host()->set_allow_cross_origin_auth_prompt(value);
+}
+
// The BrowserProcess object must outlive the file thread so we use traits
// which don't do any management.
DISABLE_RUNNABLE_METHOD_REFCOUNT(BrowserProcessImpl);

Powered by Google App Engine
This is Rietveld 408576698