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

Unified Diff: chrome/browser/managed_mode/managed_user_service.h

Issue 15715005: Remove passphrase dialog and last parts of elevation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 7 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/managed_mode/managed_user_service.h
diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h
index 5720a8fb46f6f7ed8fd46cd608d0de3592ff77a0..103b2e1bbc561e93cb06dfc799e3a3b43236697c 100644
--- a/chrome/browser/managed_mode/managed_user_service.h
+++ b/chrome/browser/managed_mode/managed_user_service.h
@@ -13,7 +13,6 @@
#include "base/string16.h"
#include "chrome/browser/extensions/management_policy.h"
#include "chrome/browser/managed_mode/managed_mode_url_filter.h"
-#include "chrome/browser/ui/webui/managed_user_passphrase_dialog.h"
#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -54,9 +53,6 @@ class ManagedUserService : public BrowserContextKeyedService,
// ManagedUserService (which could lead to cyclic dependencies).
static bool ProfileIsManaged(Profile* profile);
- // Returns the elevation state for specific WebContents.
- bool IsElevatedForWebContents(const content::WebContents* web_contents) const;
-
static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
// Returns whether managed users are enabled by Finch or the command line
@@ -109,14 +105,6 @@ class ManagedUserService : public BrowserContextKeyedService,
void GetManualExceptionsForHost(const std::string& host,
std::vector<GURL>* urls);
- // Checks if the passphrase dialog can be skipped (the profile is already in
- // elevated state for the given WebContents or the passphrase is empty).
- bool CanSkipPassphraseDialog(const content::WebContents* web_contents) const;
-
- // Handles the request to authorize as the custodian of the managed user.
- void RequestAuthorization(content::WebContents* web_contents,
- const PassphraseCheckedCallback& callback);
-
// Initializes this object. This method does nothing if the profile is not
// managed.
void Init();
@@ -213,9 +201,6 @@ class ManagedUserService : public BrowserContextKeyedService,
// corresponding preference is changed.
void UpdateManualURLs();
- // Returns if the passphrase to authorize as the custodian is empty.
- bool IsPassphraseEmpty() const;
-
base::WeakPtrFactory<ManagedUserService> weak_ptr_factory_;
// Owns us via the BrowserContextKeyedService mechanism.
@@ -224,10 +209,6 @@ class ManagedUserService : public BrowserContextKeyedService,
content::NotificationRegistrar registrar_;
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_;
-
// Sets a profile in elevated state for testing if set to true.
bool elevated_for_testing_;
« no previous file with comments | « chrome/browser/managed_mode/managed_user_passphrase_unittest.cc ('k') | chrome/browser/managed_mode/managed_user_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698