Don't show temporary patterns in chrome://settings/contentExceptions#zoomlevels

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 24 matching lines @@
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/page_zoom.h"
-#include "content/public/common/url_constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
@@ skipping 943 matching lines @@
   for (content::HostZoomMap::ZoomLevelVector::const_iterator i =
            zoom_levels.begin();
        i != zoom_levels.end();
        ++i) {
     scoped_ptr<base::DictionaryValue> exception(new base::DictionaryValue);
     switch (i->mode) {
       case content::HostZoomMap::ZOOM_CHANGED_FOR_HOST:
         exception->SetString(kOrigin, i->host);
         break;
       case content::HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST:
-        exception->SetString(
-            kOrigin, i->scheme + content::kStandardSchemeSeparator + i->host);
+        // These are not stored in preferences and get cleared on next browser
+        // start. Therefore, we don't care for them.
         break;
       case content::HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM:
         NOTREACHED();
     }
     exception->SetString(kSetting,
                          ContentSettingToString(CONTENT_SETTING_DEFAULT));
 
     // Calculate the zoom percent from the factor. Round up to the nearest whole
     // number.
     int zoom_percent = static_cast<int>(
@@ skipping 214 matching lines @@
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
 
   std::string pattern;
   rv = args->GetString(2, &pattern);
   DCHECK(rv);
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetForBrowserContext(Profile::FromWebUI(web_ui()));
   double default_level = host_zoom_map->GetDefaultZoomLevel();
-
-  std::string::size_type scheme_separator_position =
-      pattern.find(content::kStandardSchemeSeparator);
-  if (scheme_separator_position == std::string::npos) {
-    host_zoom_map->SetZoomLevelForHost(pattern, default_level);
-  } else {
-    std::string scheme = pattern.substr(0, scheme_separator_position);
-    std::string host = pattern.substr(
-        scheme_separator_position + strlen(content::kStandardSchemeSeparator));
-    host_zoom_map->SetZoomLevelForHostAndScheme(scheme, host, default_level);
-  }
+  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,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setException",
@@ skipping 306 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options