Add elevation to the managed mode navigation observer.

chrome/browser/managed_mode/managed_user_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 25 matching lines @@
   enum ManualBehavior {
     MANUAL_NONE = 0,
     MANUAL_ALLOW,
     MANUAL_BLOCK
   };
 
   explicit ManagedUserService(Profile* profile);
   virtual ~ManagedUserService();
 
   bool ProfileIsManaged() const;
+
+  // Deprecated. Use IsElevatedForWebContents() instead.
   bool IsElevated() const;
 
+  // Returns the elevation state for specific WebContents.
+  bool IsElevatedForWebContents(const content::WebContents* web_contents) const;
+
   static void RegisterUserPrefs(PrefRegistrySyncable* registry);
 
   // Returns the URL filter for the IO thread, for filtering network requests
   // (in ManagedModeResourceThrottle).
   scoped_refptr<const ManagedModeURLFilter> GetURLFilterForIOThread();
 
   // Returns the URL filter for the UI thread, for filtering navigations and
   // classifying sites in the history view.
   ManagedModeURLFilter* GetURLFilterForUIThread();
 
@@ skipping 16 matching lines @@
   void SetManualBehaviorForHosts(const std::vector<std::string>& hostnames,
                                  ManualBehavior behavior);
 
   // Returns the manual behavior for the given URL.
   ManualBehavior GetManualBehaviorForURL(const GURL& url);
 
   // Sets the manual behavior for the given URL.
   void SetManualBehaviorForURLs(const std::vector<GURL>& url,
                                 ManualBehavior behavior);
 
+  // Deprecated. Use the CanSkipPassphraseDialog() method which requires a
+  // WebContents parameter instead.
+  bool CanSkipPassphraseDialog();
+
   // Checks if the passphrase dialog can be skipped (the profile is already in
-  // elevated state or the passphrase is empty).
-  bool CanSkipPassphraseDialog();
+  // elevated state for the given WebContents or the passphrase is empty).
+  bool CanSkipPassphraseDialog(const content::WebContents* web_contents) const;
+
+  // Returns if the passphrase to authorize as the custodian is empty.
+  bool IsPassphraseEmpty() const;

[Bernhard Bauer, 2013/03/21 15:52:58]

Where do we need this method?

[Adrian Kuegel, 2013/03/21 16:30:04]

In CanSkipPassphraseDialog. But I guess we can make it a private method. I
changed it like that.

 
   // Handles the request to authorize as the custodian of the managed user.
   void RequestAuthorization(content::WebContents* web_contents,
                             const PassphraseCheckedCallback& callback);
 
   // Handles the request to authorize as the custodian of the managed user.
   // Also determines the active web contents to be passed to the passphrase
   // dialog.
   void RequestAuthorizationUsingActiveWebContents(
       Browser* browser,
       const PassphraseCheckedCallback& callback);
 
+  // Set the elevation state for the profile.
   void SetElevated(bool is_elevated);
 
   // Add an elevation for a specific extension which allows the managed user to
   // install/uninstall this specific extension.
   void AddElevationForExtension(const std::string& extension_id);
 
   // Remove the elevation for a specific extension.
   void RemoveElevationForExtension(const std::string& extension_id);
 
   // Initializes this object. This method does nothing if the profile is not
@@ skipping 79 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
 
   // Stores the extension ids of the extensions which currently can be modified
   // by the managed user.
   std::set<std::string> elevated_for_extensions_;
 
   URLFilterContext url_filter_context_;
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_