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

Unified Diff: chrome/browser/managed_mode/managed_mode_navigation_observer.cc

Issue 15715005: Remove passphrase dialog and last parts of elevation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also remove managed_user_passphrase_unittest. 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_mode_navigation_observer.cc
diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
index 3d07c6d53784886db4ff46a4a9011d597756b9e7..8dbca56409288589d1009cf7eaeacb7e867d77e7 100644
--- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
+++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc
@@ -159,13 +159,11 @@ ManagedModeNavigationObserver::~ManagedModeNavigationObserver() {
ManagedModeNavigationObserver::ManagedModeNavigationObserver(
content::WebContents* web_contents)
: WebContentsObserver(web_contents),
- warn_infobar_delegate_(NULL),
- is_elevated_(false) {
+ warn_infobar_delegate_(NULL) {
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
managed_user_service_ = ManagedUserServiceFactory::GetForProfile(profile);
if (!managed_user_service_->ProfileIsManaged())
Pam (message me for reviews) 2013/05/24 11:01:24 This line needs to be removed too.
Adrian Kuegel 2013/05/24 11:07:22 Right, I missed that. Thanks for noticing.
- is_elevated_ = true;
url_filter_ = managed_user_service_->GetURLFilterForUIThread();
}
@@ -174,22 +172,6 @@ void ManagedModeNavigationObserver::WarnInfobarDismissed() {
warn_infobar_delegate_ = NULL;
}
-bool ManagedModeNavigationObserver::is_elevated() const {
-#if defined(OS_CHROMEOS)
- return false;
-#else
- return is_elevated_;
-#endif
-}
-
-void ManagedModeNavigationObserver::set_elevated(bool is_elevated) {
-#if defined(OS_CHROMEOS)
- NOTREACHED();
-#else
- is_elevated_ = is_elevated;
-#endif
-}
-
void ManagedModeNavigationObserver::ProvisionalChangeToMainFrameUrl(
const GURL& url,
content::RenderViewHost* render_view_host) {
« no previous file with comments | « chrome/browser/managed_mode/managed_mode_navigation_observer.h ('k') | chrome/browser/managed_mode/managed_user_passphrase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698