Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/ui/views/options/exception_editor_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 20 matching lines @@
 // To use an ExceptionEditorView create one and invoke Show on it.
 // ExceptionEditorView is deleted when the dialog closes.
 class ExceptionEditorView : public views::View,
                             public views::Textfield::Controller,
                             public views::DialogDelegate {
  public:
   class Delegate {
    public:
     // Invoked when the user accepts the edit.
     virtual void AcceptExceptionEdit(
-        const HostContentSettingsMap::Pattern& pattern,
+        const ContentSettingsPattern& pattern,
         ContentSetting setting,
         bool is_off_the_record,
         int index,
         bool is_new) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   // Creates a new ExceptionEditorView with the supplied args. |index| is the
   // index into the ContentExceptionsTableModel of the exception. This is not
   // used by ExceptionEditorView but instead passed to the delegate.
   ExceptionEditorView(Delegate* delegate,
                       ContentExceptionsTableModel* model,
                       bool allow_off_the_record,
                       int index,
-                      const HostContentSettingsMap::Pattern& pattern,
+                      const ContentSettingsPattern& pattern,
                       ContentSetting setting,
                       bool is_off_the_record);
   virtual ~ExceptionEditorView() {}
 
   void Show(gfx::NativeWindow parent);
 
   // views::DialogDelegate overrides.
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual bool IsDialogButtonEnabled(
@@ skipping 11 matching lines @@
                                const views::Textfield::Keystroke& key);
 
  private:
   void Init();
 
   views::Label* CreateLabel(int message_id);
 
   // Returns true if we're adding a new item.
   bool is_new() const { return index_ == -1; }
 
-  bool IsPatternValid(const HostContentSettingsMap::Pattern& pattern,
+  bool IsPatternValid(const ContentSettingsPattern& pattern,
                       bool is_off_the_record) const;
 
   void UpdateImageView(views::ImageView* image_view, bool is_valid);
 
   Delegate* delegate_;
   ContentExceptionsTableModel* model_;
   ContentSettingComboModel cb_model_;
 
   // Index of the item being edited. If -1, indices this is a new entry.
   const bool allow_off_the_record_;
   const int index_;
-  const HostContentSettingsMap::Pattern pattern_;
+  const ContentSettingsPattern pattern_;
   const ContentSetting setting_;
   const bool is_off_the_record_;
 
   views::Textfield* pattern_tf_;
   views::ImageView* pattern_iv_;
   views::Combobox* action_cb_;
   views::Checkbox* incognito_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(ExceptionEditorView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_