Add elevation to the managed mode navigation observer.

chrome/browser/managed_mode/managed_user_service.cc

 // Copyright (c) 2013 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/managed_mode/managed_user_service.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 74 matching lines @@
 }
 
 bool ManagedUserService::ProfileIsManaged() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kProfileIsManaged);
 }
 
 bool ManagedUserService::IsElevated() const {
   return is_elevated_;
 }
 
+bool ManagedUserService::IsElevatedForWebContents(
+    const content::WebContents* web_contents) const {
+  const ManagedModeNavigationObserver* observer =
+      ManagedModeNavigationObserver::FromWebContents(web_contents);
+  return observer->is_elevated();
+}
+
+bool ManagedUserService::IsPassphraseEmpty() const {
+  PrefService* pref_service = profile_->GetPrefs();
+  return pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
+}
+
+// TODO(akuegel): This should be deprecated.

[Bernhard Bauer, 2013/03/20 15:08:30]

Why don't you just go ahead and mark it as deprecated then? That still won't
keep anyone from using it, but I think we are the only users anyway.

[Adrian Kuegel, 2013/03/20 15:51:16]

Done.

[Bernhard Bauer, 2013/03/20 15:57:17]

Ideally, add "Use Foo() instead".

 bool ManagedUserService::CanSkipPassphraseDialog() {
   // If the profile is already elevated or there is no passphrase set, no
   // authentication is needed.
-  PrefService* pref_service = profile_->GetPrefs();
+  return IsElevated() || IsPassphraseEmpty();
+}
+
+bool ManagedUserService::CanSkipPassphraseDialog(
+    const content::WebContents* web_contents) const {
   return IsElevated() ||
-      pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
+      IsElevatedForWebContents(web_contents) ||
+      IsPassphraseEmpty();
 }
 
 void ManagedUserService::RequestAuthorization(
     content::WebContents* web_contents,
     const PassphraseCheckedCallback& callback) {
-  if (CanSkipPassphraseDialog()) {
+  if (CanSkipPassphraseDialog(web_contents)) {
     callback.Run(true);
     return;
   }
 
   // Is deleted automatically when the dialog is closed.
   new ManagedUserPassphraseDialog(web_contents, callback);
 }
 
 void ManagedUserService::RequestAuthorizationUsingActiveWebContents(
     Browser* browser,
@@ skipping 242 matching lines @@
     }
   }
 
   UpdateManualURLs();
 }
 
 void ManagedUserService::SetElevated(bool is_elevated) {
   is_elevated_ = is_elevated;
 }
 
+void ManagedUserService::SetElevatedForWebContents(

[Bernhard Bauer, 2013/03/20 15:08:30]

I'm not convinced that adding this method is very useful over just setting the
flag directly on the ManagedModeNavigationObserver, but I'd need to see callers
to fully judge it

[Adrian Kuegel, 2013/03/20 15:51:16]

True, that would work, too. The only (very) small disadvantage is that I need
one more line for the include file at each call site, otherwise it should
basically result in the same number of lines. So I will remove this method.

+    bool is_elevated,
+    content::WebContents* web_contents) {
+  ManagedModeNavigationObserver::FromWebContents(web_contents)->SetElevated(
+      is_elevated);
+}
+
 void ManagedUserService::AddElevationForExtension(
     const std::string& extension_id) {
   elevated_for_extensions_.insert(extension_id);
 }
 
 void ManagedUserService::RemoveElevationForExtension(
     const std::string& extension_id) {
   elevated_for_extensions_.erase(extension_id);
 }
 
@@ skipping 51 matching lines @@
       profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs);
   scoped_ptr<std::map<GURL, bool> > url_map(new std::map<GURL, bool>());
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     bool allow = false;
     bool result = it.value().GetAsBoolean(&allow);
     DCHECK(result);
     (*url_map)[GURL(it.key())] = allow;
   }
   url_filter_context_.SetManualURLs(url_map.Pass());
 }