Changes to support new cookie policy....

chrome/browser/views/options/advanced_contents_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/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
@@ skipping 26 matching lines @@
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/ssl_config_service_win.h"
-#include "net/base/cookie_policy.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
@@ skipping 376 matching lines @@
   layout->StartRow(0, single_column_layout_id);
   layout->AddView(title_label_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, inset_column_layout_id);
   layout->AddView(contents_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PrivacySection
 
-class CookieBehaviorComboModel : public ComboboxModel {
- public:
-  CookieBehaviorComboModel() {}
-
-  // Return the number of items in the combo box.
-  virtual int GetItemCount() {
-    return 3;
-  }
-
-  virtual std::wstring GetItemAt(int index) {
-    const int kStringIDs[] = {
-      IDS_OPTIONS_COOKIES_ACCEPT_ALL_COOKIES,
-      IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES,
-      IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES
-    };
-    if (index >= 0 && index < arraysize(kStringIDs))
-      return l10n_util::GetString(kStringIDs[index]);
-
-    NOTREACHED();
-    return L"";
-  }
-
-  static int CookiePolicyToIndex(net::CookiePolicy::Type policy) {
-    return policy;
-  }
-
-  static net::CookiePolicy::Type IndexToCookiePolicy(int index) {
-    if (net::CookiePolicy::ValidType(index))
-      return net::CookiePolicy::FromInt(index);
-
-    NOTREACHED();
-    return net::CookiePolicy::ALLOW_ALL_COOKIES;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CookieBehaviorComboModel);
-};
-
 class PrivacySection : public AdvancedSection,
                        public views::ButtonListener,
                        public views::LinkController {
  public:
   explicit PrivacySection(Profile* profile);
   virtual ~PrivacySection() {}
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
@@ skipping 13 matching lines @@
   views::NativeButton* content_settings_button_;
   views::NativeButton* clear_data_button_;
   views::Label* section_description_label_;
   views::Checkbox* enable_link_doctor_checkbox_;
   views::Checkbox* enable_suggest_checkbox_;
   views::Checkbox* enable_dns_prefetching_checkbox_;
   views::Checkbox* enable_safe_browsing_checkbox_;
   views::Checkbox* reporting_enabled_checkbox_;
   views::Link* learn_more_link_;
 
-  // Dummy for now. Used to populate cookies models.
-  scoped_ptr<CookieBehaviorComboModel> allow_cookies_model_;
-
   // Preferences for this section:
   BooleanPrefMember alternate_error_pages_;
   BooleanPrefMember use_suggest_;
   BooleanPrefMember dns_prefetch_enabled_;
   BooleanPrefMember safe_browsing_;
   BooleanPrefMember enable_metrics_recording_;
 
   void ResolveMetricsReportingEnabled();
 
   DISALLOW_COPY_AND_ASSIGN(PrivacySection);
@@ skipping 860 matching lines @@
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBounds(lb);
   scroll_view_->Layout();
 }