Remove enable-iframe-based-signin flag.

chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 574 matching lines @@
   // Here we only subscribe to the HostZoomMap for the default storage partition
   // since we don't allow the user to manage the zoom levels for apps.
   // We're only interested in zoom-levels that are persisted, since the user
   // is given the opportunity to view/delete these in the content-settings page.
   host_zoom_map_subscription_ =
       content::HostZoomMap::GetDefaultForBrowserContext(context)
           ->AddZoomLevelChangedCallback(
               base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
                          base::Unretained(this)));
 
-  if (!switches::IsEnableWebviewBasedSignin()) {
-    // The legacy signin page uses a different storage partition, so we need to
-    // add a subscription for its HostZoomMap separately.
-    GURL signin_url(chrome::kChromeUIChromeSigninURL);
-    content::StoragePartition* signin_partition =
-        content::BrowserContext::GetStoragePartitionForSite(
-            GetBrowserContext(web_ui()), signin_url);
-    content::HostZoomMap* signin_host_zoom_map =
-        signin_partition->GetHostZoomMap();
-    signin_host_zoom_map_subscription_ =
-        signin_host_zoom_map->AddZoomLevelChangedCallback(
-            base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
-                       base::Unretained(this)));
-  }
-
   flash_settings_manager_.reset(new PepperFlashSettingsManager(this, context));
 
   Profile* profile = Profile::FromWebUI(web_ui());
   observer_.Add(HostContentSettingsMapFactory::GetForProfile(profile));
   if (profile->HasOffTheRecordProfile()) {
     auto map = HostContentSettingsMapFactory::GetForProfile(
         profile->GetOffTheRecordProfile());
     if (!observer_.IsObserving(map))
       observer_.Add(map);
   }
@@ skipping 336 matching lines @@
   settings.exceptions_initialized = true;
   UpdateFlashMediaLinksVisibility(type);
 }
 
 void ContentSettingsHandler::UpdateMIDISysExExceptionsView() {
   UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
   UpdateExceptionsViewFromHostContentSettingsMap(
       CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
 }
 
-void ContentSettingsHandler::AdjustZoomLevelsListForSigninPageIfNecessary(
-    content::HostZoomMap::ZoomLevelVector* zoom_levels) {
-  if (switches::IsEnableWebviewBasedSignin())
-    return;
-
-  GURL signin_url(chrome::kChromeUIChromeSigninURL);
-  content::HostZoomMap* signin_host_zoom_map =
-      content::BrowserContext::GetStoragePartitionForSite(
-          GetBrowserContext(web_ui()), signin_url)->GetHostZoomMap();
-
-  // Since zoom levels set for scheme + host are not persisted, and since the
-  // signin page zoom levels need to be persisted, they are stored without
-  // a scheme. We use an empty scheme string to indicate this.
-  std::string scheme;
-  std::string host = signin_url.host();
-
-  // If there's a WebView signin zoom level, remove it.
-  content::HostZoomMap::ZoomLevelVector::iterator it =
-      std::find_if(zoom_levels->begin(), zoom_levels->end(),
-                   [&host](content::HostZoomMap::ZoomLevelChange change) {
-                     return change.host == host;
-                   });
-  if (it != zoom_levels->end())
-    zoom_levels->erase(it);
-
-  // If there's a non-WebView signin zoom level, add it.
-  if (signin_host_zoom_map->HasZoomLevel(scheme, host)) {
-    content::HostZoomMap::ZoomLevelChange change = {
-        content::HostZoomMap::ZOOM_CHANGED_FOR_HOST,
-        host,
-        scheme,
-        signin_host_zoom_map->GetZoomLevelForHostAndScheme(scheme, host)};
-    zoom_levels->push_back(change);
-  }
-}
-
 void ContentSettingsHandler::UpdateZoomLevelsExceptionsView() {
   base::ListValue zoom_levels_exceptions;
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(
           GetBrowserContext(web_ui()));
   content::HostZoomMap::ZoomLevelVector zoom_levels(
       host_zoom_map->GetAllZoomLevels());
 
-  AdjustZoomLevelsListForSigninPageIfNecessary(&zoom_levels);
-
   // Sort ZoomLevelChanges by host and scheme
   // (a.com < http://a.com < https://a.com < b.com).
   std::sort(zoom_levels.begin(), zoom_levels.end(),
             [](const content::HostZoomMap::ZoomLevelChange& a,
                const content::HostZoomMap::ZoomLevelChange& b) {
               return a.host == b.host ? a.scheme < b.scheme : a.host < b.host;
             });
 
   for (content::HostZoomMap::ZoomLevelVector::const_iterator i =
            zoom_levels.begin();
@@ skipping 282 matching lines @@
   std::string pattern;
   rv = args->GetString(2, &pattern);
   DCHECK(rv);
 
   if (pattern ==
           l10n_util::GetStringUTF8(IDS_ZOOMLEVELS_CHROME_ERROR_PAGES_LABEL)) {
     pattern = content::kUnreachableWebDataURL;
   }
 
   content::HostZoomMap* host_zoom_map;
-  if (switches::IsEnableWebviewBasedSignin() ||
-      pattern != chrome::kChromeUIChromeSigninHost) {
-    host_zoom_map =
-      content::HostZoomMap::GetDefaultForBrowserContext(
-          GetBrowserContext(web_ui()));
-  } else {
-    host_zoom_map =
-        content::BrowserContext::GetStoragePartitionForSite(
-            GetBrowserContext(web_ui()), GURL(chrome::kChromeUIChromeSigninURL))
-            ->GetHostZoomMap();
-  }
+  host_zoom_map =
+    content::HostZoomMap::GetDefaultForBrowserContext(
+        GetBrowserContext(web_ui()));
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   host_zoom_map->SetZoomLevelForHost(pattern, default_level);
 }
 
 void ContentSettingsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("setContentFilter",
       base::Bind(&ContentSettingsHandler::SetContentFilter,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeException",
       base::Bind(&ContentSettingsHandler::RemoveException,
@@ skipping 326 matching lines @@
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options