Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/dom_ui/options/content_settings_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/content_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_helper.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
-typedef HostContentSettingsMap::ContentSettingsDetails ContentSettingsDetails;
-
 namespace {
 
 const char* kDisplayPattern = "displayPattern";
 const char* kSetting = "setting";
 const char* kOrigin = "origin";
 const char* kEmbeddingOrigin = "embeddingOrigin";
 
 ContentSettingsType ContentSettingsTypeFromGroupName(const std::string& name) {
   if (name == "cookies")
     return CONTENT_SETTINGS_TYPE_COOKIES;
@@ skipping 66 matching lines @@
 
   return indent + l10n_util::GetStringFUTF8(
       IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST,
       UTF8ToUTF16(content_settings_helper::OriginToString(embedding_origin)));
 }
 
 // Create a DictionaryValue* that will act as a data source for a single row
 // in a HostContentSettingsMap-controlled exceptions table (e.g., cookies).
 // Ownership of the pointer is passed to the caller.
 DictionaryValue* GetExceptionForPage(
-    const HostContentSettingsMap::Pattern pattern,
+    const ContentSettingsPattern pattern,
     ContentSetting setting) {
   DictionaryValue* exception = new DictionaryValue();
   exception->Set(
       kDisplayPattern,
       new StringValue(pattern.AsString()));
   exception->Set(
       kSetting,
       new StringValue(ContentSettingToString(setting)));
   return exception;
 }
@@ skipping 197 matching lines @@
       break;
     }
 
     case NotificationType::OTR_PROFILE_CREATED: {
       UpdateAllOTRExceptionsViewsFromModel();
       break;
     }
 
     case NotificationType::CONTENT_SETTINGS_CHANGED: {
       const ContentSettingsDetails* settings_details =
-          static_cast<Details<const ContentSettingsDetails> >(details).ptr();
+          Details<const ContentSettingsDetails>(details).ptr();
 
       // TODO(estade): we pretend update_all() is always true.
       if (settings_details->update_all_types())
         UpdateAllExceptionsViewsFromModel();
       else
         UpdateExceptionsViewFromModel(settings_details->type());
       break;
     }
 
     case NotificationType::PREF_CHANGED: {
@@ skipping 282 matching lines @@
       rv = args->GetString(arg_i++, &pattern);
       DCHECK(rv);
 
       HostContentSettingsMap* settings_map =
           mode == "normal" ? GetContentSettingsMap() :
                              GetOTRContentSettingsMap();
       // The settings map could be null if the mode was OTR but the OTR profile
       // got destroyed before we received this message.
       if (settings_map) {
         settings_map->SetContentSetting(
-            HostContentSettingsMap::Pattern(pattern),
+            ContentSettingsPattern(pattern),
             ContentSettingsTypeFromGroupName(type_string),
             "",
             CONTENT_SETTING_DEFAULT);
       }
     }
   }
 }
 
 void ContentSettingsHandler::SetException(const ListValue* args) {
   size_t arg_i = 0;
@@ skipping 15 matching lines @@
 
   HostContentSettingsMap* settings_map =
       mode == "normal" ? GetContentSettingsMap() :
                          GetOTRContentSettingsMap();
 
   // The settings map could be null if the mode was OTR but the OTR profile
   // got destroyed before we received this message.
   if (!settings_map)
     return;
 
-  settings_map->
-      SetContentSetting(HostContentSettingsMap::Pattern(pattern),
-                        type,
-                        "",
-                        ContentSettingFromString(setting));
+  settings_map->SetContentSetting(ContentSettingsPattern(pattern),
+                                  type,
+                                  "",
+                                  ContentSettingFromString(setting));
 }
 
 void ContentSettingsHandler::CheckExceptionPatternValidity(
     const ListValue* args) {
   size_t arg_i = 0;
   Value* type;
   CHECK(args->Get(arg_i++, &type));
   std::string mode_string;
   CHECK(args->GetString(arg_i++, &mode_string));
   std::string pattern_string;
   CHECK(args->GetString(arg_i++, &pattern_string));
 
-  HostContentSettingsMap::Pattern pattern(pattern_string);
+  ContentSettingsPattern pattern(pattern_string);
 
   scoped_ptr<Value> mode_value(Value::CreateStringValue(mode_string));
   scoped_ptr<Value> pattern_value(Value::CreateStringValue(pattern_string));
   scoped_ptr<Value> valid_value(Value::CreateBooleanValue(pattern.IsValid()));
 
   dom_ui_->CallJavascriptFunction(
       L"ContentSettings.patternValidityCheckComplete", *type,
                                                        *mode_value.get(),
                                                        *pattern_value.get(),
                                                        *valid_value.get());
@@ skipping 32 matching lines @@
   return dom_ui_->GetProfile()->GetHostContentSettingsMap();
 }
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = dom_ui_->GetProfile();
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }