Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/ui/views/options/exception_editor_view.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/views/options/exception_editor_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_parse.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
 ExceptionEditorView::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)
     : delegate_(delegate),
       model_(model),
       cb_model_(model->content_type()),
       allow_off_the_record_(allow_off_the_record),
       index_(index),
       pattern_(pattern),
       setting_(setting),
       is_off_the_record_(is_off_the_record) {
@@ skipping 18 matching lines @@
 }
 
 std::wstring ExceptionEditorView::GetWindowTitle() const {
   return is_new() ? l10n_util::GetString(IDS_EXCEPTION_EDITOR_NEW_TITLE) :
                     l10n_util::GetString(IDS_EXCEPTION_EDITOR_TITLE);
 }
 
 bool ExceptionEditorView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return IsPatternValid(HostContentSettingsMap::Pattern(
+    return IsPatternValid(ContentSettingsPattern(
                           UTF16ToUTF8(pattern_tf_->text())),
                           incognito_cb_->checked());
   }
   return true;
 }
 
 bool ExceptionEditorView::Cancel() {
   return true;
 }
 
 bool ExceptionEditorView::Accept() {
-  HostContentSettingsMap::Pattern new_pattern(UTF16ToUTF8(pattern_tf_->text()));
+  ContentSettingsPattern new_pattern(UTF16ToUTF8(pattern_tf_->text()));
   ContentSetting setting =
       cb_model_.SettingForIndex(action_cb_->selected_item());
   bool is_off_the_record = incognito_cb_->checked();
   delegate_->AcceptExceptionEdit(
       new_pattern, setting, is_off_the_record, index_, is_new());
   return true;
 }
 
 views::View* ExceptionEditorView::GetContentsView() {
   return this;
 }
 
 void ExceptionEditorView::ContentsChanged(views::Textfield* sender,
                                           const std::wstring& new_contents) {
   GetDialogClientView()->UpdateDialogButtons();
-  UpdateImageView(pattern_iv_, IsPatternValid(HostContentSettingsMap::Pattern(
+  UpdateImageView(pattern_iv_, IsPatternValid(ContentSettingsPattern(
       UTF16ToUTF8(pattern_tf_->text())), incognito_cb_->checked()));
 }
 
 bool ExceptionEditorView::HandleKeystroke(
     views::Textfield* sender,
     const views::Textfield::Keystroke& key) {
   return false;
 }
 
 void ExceptionEditorView::Init() {
   using views::GridLayout;
 
   pattern_tf_ = new views::Textfield();
   pattern_tf_->SetText(UTF8ToUTF16(pattern_.AsString()));
   pattern_tf_->SetController(this);
 
   pattern_iv_ = new views::ImageView;
 
-  UpdateImageView(pattern_iv_, IsPatternValid(HostContentSettingsMap::Pattern(
+  UpdateImageView(pattern_iv_, IsPatternValid(ContentSettingsPattern(
       UTF16ToUTF8(pattern_tf_->text())), is_off_the_record_));
 
   action_cb_ = new views::Combobox(&cb_model_);
   if (!is_new())
     action_cb_->SetSelectedItem(cb_model_.IndexForSetting(setting_));
 
   incognito_cb_ = new views::Checkbox(
       l10n_util::GetString(IDS_EXCEPTION_EDITOR_OTR_TITLE));
   incognito_cb_->SetChecked(is_off_the_record_);
 
@@ skipping 27 matching lines @@
   }
 }
 
 views::Label* ExceptionEditorView::CreateLabel(int message_id) {
   views::Label* label = new views::Label(l10n_util::GetString(message_id));
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   return label;
 }
 
 bool ExceptionEditorView::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 ExceptionEditorView::UpdateImageView(views::ImageView* image_view,
                                           bool is_valid) {
    return image_view->SetImage(
        ResourceBundle::GetSharedInstance().GetBitmapNamed(
            is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT));
 }