Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/gtk/options/content_exception_editor.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/gtk/options/content_exception_editor.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 ContentExceptionEditor::ContentExceptionEditor(
     GtkWindow* parent,
     ContentExceptionEditor::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)
     : delegate_(delegate),
       model_(model),
       cb_model_(model->content_type()),
       index_(index),
       pattern_(pattern),
       setting_(setting) {
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(is_new() ?
@@ skipping 49 matching lines @@
   // Prime the state of the buttons.
   OnEntryChanged(entry_);
 
   gtk_util::ShowDialog(dialog_);
 
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroyThunk), this);
 }
 
 bool ContentExceptionEditor::IsPatternValid(
-    const HostContentSettingsMap::Pattern& pattern,
+    const ContentSettingsPattern& pattern,
     bool is_off_the_record) const {
   bool is_valid_pattern = pattern.IsValid() &&
       (model_->IndexOfExceptionByPattern(pattern, is_off_the_record) == -1);
 
   return is_new() ? is_valid_pattern : (!pattern.AsString().empty() &&
       ((pattern_ == pattern) || is_valid_pattern));
 }
 
 void ContentExceptionEditor::UpdateImage(GtkWidget* image, bool is_valid) {
   return gtk_image_set_from_pixbuf(GTK_IMAGE(image),
       ResourceBundle::GetSharedInstance().GetPixbufNamed(
           is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT));
 }
 
 void ContentExceptionEditor::OnEntryChanged(GtkWidget* entry) {
-  HostContentSettingsMap::Pattern new_pattern(
-      gtk_entry_get_text(GTK_ENTRY(entry)));
+  ContentSettingsPattern new_pattern(gtk_entry_get_text(GTK_ENTRY(entry)));
   bool is_off_the_record =
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(otr_checkbox_));
   bool is_valid = IsPatternValid(new_pattern, is_off_the_record);
   gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog_),
                                     GTK_RESPONSE_OK, is_valid);
   UpdateImage(pattern_image_, is_valid);
 }
 
 void ContentExceptionEditor::OnResponse(GtkWidget* sender, int response_id) {
   if (response_id == GTK_RESPONSE_OK) {
     // Notify our delegate to update everything.
-    HostContentSettingsMap::Pattern new_pattern(
-        gtk_entry_get_text(GTK_ENTRY(entry_)));
+    ContentSettingsPattern new_pattern(gtk_entry_get_text(GTK_ENTRY(entry_)));
     ContentSetting setting = cb_model_.SettingForIndex(
         gtk_combo_box_get_active(GTK_COMBO_BOX(action_combo_)));
     bool is_off_the_record =
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(otr_checkbox_));
     delegate_->AcceptExceptionEdit(
         new_pattern, setting, is_off_the_record, index_, is_new());
   }
 
   gtk_widget_destroy(dialog_);
 }
 
 void ContentExceptionEditor::OnWindowDestroy(GtkWidget* widget) {
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }