Make --allow-cross-domain-auth-prompt equivalent to a preference.

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 654 matching lines @@
         plugin_data_remover_->StartRemoving(base::Time());
       }
     }
   } else if (type == NotificationType::PREF_CHANGED) {
     std::string* pref = Details<std::string>(details).ptr();
     if (*pref == prefs::kDefaultBrowserSettingEnabled) {
       if (local_state_->GetBoolean(prefs::kDefaultBrowserSettingEnabled))
         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();
 }
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 void BrowserProcessImpl::StartAutoupdateTimer() {
   autoupdate_timer_.Start(
       base::TimeDelta::FromHours(kUpdateCheckIntervalHours),
       this,
@@ skipping 46 matching lines @@
   resource_queue_delegates.insert(new UserScriptListener());
 
   resource_dispatcher_host_.reset(
       new ResourceDispatcherHost(resource_queue_delegates));
   resource_dispatcher_host_->Initialize();
 
   resource_dispatcher_host_observer_.reset(
       new ChromeResourceDispatcherHostObserver(prerender_tracker()));
   resource_dispatcher_host_->set_observer(
       resource_dispatcher_host_observer_.get());
+
+  ApplyAllowCrossOriginAuthPromptPolicy();
 }
 
 void BrowserProcessImpl::CreateMetricsService() {
   DCHECK(!created_metrics_service_ && metrics_service_.get() == NULL);
   created_metrics_service_ = true;
 
   metrics_service_.reset(new MetricsService);
 }
 
 void BrowserProcessImpl::CreateIOThread() {
@@ skipping 180 matching lines @@
 
   // Initialize the disk cache location policy. This policy is not hot update-
   // able so we need to have it when initializing the profiles.
   local_state_->RegisterFilePathPref(prefs::kDiskCacheDir, FilePath());
 
   // This is observed by ChildProcessSecurityPolicy, which lives in content/
   // though, so it can't register itself.
   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 discouraged (the code above should
also be fixed at some point). Central trigger for registering prefs is
browser::RegisterLocalState(), which tells the subsystems to register their
respective prefs. The rationale is that we want to have all supported prefs
readable right after PrefService initialization.

+  pref_change_registrar_.Add(prefs::kAllowCrossOriginAuthPrompt, this);
 }
 
 void BrowserProcessImpl::CreateIconManager() {
   DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL);
   created_icon_manager_ = true;
   icon_manager_.reset(new IconManager);
 }
 
 void BrowserProcessImpl::CreateDevToolsManager() {
   DCHECK(devtools_manager_.get() == NULL);
@@ skipping 87 matching lines @@
   const ListValue* scheme_list = local_state_->GetList(prefs::kDisabledSchemes);
   for (ListValue::const_iterator iter = scheme_list->begin();
        iter != scheme_list->end(); ++iter) {
     std::string scheme;
     if ((*iter)->GetAsString(&scheme))
       schemes.insert(scheme);
   }
   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);
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 
 void BrowserProcessImpl::SetIPCLoggingEnabled(bool enable) {
   // First enable myself.
   if (enable)
     IPC::Logging::GetInstance()->Enable();
@@ skipping 79 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)