Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/ui/cocoa/content_settings_dialog_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
+#import "chrome/browser/content_settings/content_settings_details.h"
 #import "chrome/browser/content_settings/host_content_settings_map.h"
 #import "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #import "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
 #import "chrome/browser/notifications/desktop_notification_service.h"
 #import "chrome/browser/notifications/notification_exceptions_table_model.h"
 #include "chrome/browser/plugin_exceptions_table_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 20 matching lines @@
 @interface ContentSettingsDialogController(Private)
 - (id)initWithProfile:(Profile*)profile;
 - (void)selectTab:(ContentSettingsType)settingsType;
 - (void)showExceptionsForType:(ContentSettingsType)settingsType;
 
 // Callback when preferences are changed. |prefName| is the name of the
 // pref that has changed.
 - (void)prefChanged:(const std::string&)prefName;
 
 // Callback when content settings are changed.
-- (void)contentSettingsChanged:
-    (HostContentSettingsMap::ContentSettingsDetails*)details;
+- (void)contentSettingsChanged:(ContentSettingsDetails*)details;
 
 @end
 
 namespace ContentSettingsDialogControllerInternal {
 
 // A C++ class registered for changes in preferences.
 class PrefObserverBridge : public NotificationObserver {
  public:
   PrefObserverBridge(ContentSettingsDialogController* controller)
       : controller_(controller), disabled_(false) {}
 
   virtual ~PrefObserverBridge() {}
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     if (disabled_)
       return;
 
     // This is currently used by most notifications.
     if (type == NotificationType::PREF_CHANGED) {
       std::string* detail = Details<std::string>(details).ptr();
       if (detail)
         [controller_ prefChanged:*detail];
     }
 
     // This is sent when the "is managed" state changes.
     // TODO(markusheintz): Move all content settings to this notification.
     if (type == NotificationType::CONTENT_SETTINGS_CHANGED) {
-      HostContentSettingsMap::ContentSettingsDetails* settings_details =
-        Details<HostContentSettingsMap::ContentSettingsDetails>(details).ptr();
+      ContentSettingsDetails* settings_details =
+          Details<ContentSettingsDetails>(details).ptr();
       [controller_ contentSettingsChanged:settings_details];
     }
   }
 
   void SetDisabled(bool disabled) {
     disabled_ = disabled;
   }
 
  private:
   ContentSettingsDialogController* controller_;  // weak, owns us
@@ skipping 536 matching lines @@
   if (prefName == prefs::kGeolocationDefaultContentSetting) {
     [self willChangeValueForKey:@"geolocationSettingIndex"];
     [self didChangeValueForKey:@"geolocationSettingIndex"];
   }
   if (prefName == prefs::kDesktopNotificationDefaultContentSetting) {
     [self willChangeValueForKey:@"notificationsSettingIndex"];
     [self didChangeValueForKey:@"notificationsSettingIndex"];
   }
 }
 
-- (void)contentSettingsChanged:
-    (HostContentSettingsMap::ContentSettingsDetails*)details {
+- (void)contentSettingsChanged:(ContentSettingsDetails*)details {
   [self prefChanged:prefs::kBlockNonsandboxedPlugins];
   [self prefChanged:prefs::kDefaultContentSettings];
 }
 
 @end