Remove passphrase dialog and last parts of elevation.

chrome/browser/managed_mode/managed_mode_navigation_observer.cc

 // Copyright (c) 2012 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_mode_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 141 matching lines @@
 // ManagedModeNavigationObserver ----------------------------------------------
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagedModeNavigationObserver);
 
 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();
 }
 
 void ManagedModeNavigationObserver::WarnInfobarDismissed() {
   DCHECK(warn_infobar_delegate_);
   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) {
   ManagedModeURLFilter::FilteringBehavior behavior =
       url_filter_->GetFilteringBehaviorForURL(url);
 
   if (behavior == ManagedModeURLFilter::WARN || !warn_infobar_delegate_)
     return;
 
   // If we shouldn't have a warn infobar remove it here.
@@ skipping 49 matching lines @@
   HistoryService* history_service =
      HistoryServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);
 
   // |history_service| is null if saving history is disabled.
   if (history_service)
     history_service->AddPage(add_page_args);
 
   // Show the interstitial.
   new ManagedModeInterstitial(web_contents, url, callback);
 }