Add WebsiteSettingsUI for Windows

chrome/browser/website_settings.cc

 // Copyright (c) 2012 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/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 23 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(TOOLKIT_GTK)

[Ben Goodger (Google), 2012/05/29 19:54:20]

again, toolkit-specific ifdefs are gross, so think about how to avoid
proliferating them here and cleaning up the existing usage.

[markusheintz_, 2012/06/05 17:02:12]

Obsolete since http://codereview.chromium.org/10440092/

 #include "chrome/browser/ui/gtk/website_settings_popup_gtk.h"
+#elif defined(TOOLKIT_VIEWS)
+#include "chrome/browser/ui/views/website_settings_popup_view.h"

[tfarina, 2012/05/29 19:38:57]

you can't do this anymore :) see chrome/browser/DEPS file.

[markusheintz_, 2012/06/05 17:02:12]

Obsolete since http://codereview.chromium.org/10440092/

 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 ContentSettingsType kPermissionType[] = {
   CONTENT_SETTINGS_TYPE_POPUPS,
   CONTENT_SETTINGS_TYPE_PLUGINS,
   CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
@@ skipping 440 matching lines @@
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
 
   }
   ui_->SetFirstVisit(first_visit_text);
 }
 
+#if defined(TOOLKIT_GTK)
 // static
 void WebsiteSettings::Show(gfx::NativeWindow parent,
                            Profile* profile,
                            TabContentsWrapper* tab_contents_wrapper,
                            const GURL& url,
                            const content::SSLStatus& ssl) {
-#if defined(TOOLKIT_GTK)
   // The WebsiteSettingsModel will delete itself after the UI is closed.
   new WebsiteSettings(new WebsiteSettingsPopupGtk(parent,
                                                   profile,
                                                   tab_contents_wrapper),
                       profile,
                       tab_contents_wrapper->content_settings(),
                       url,
                       ssl,
                       content::CertStore::GetInstance());
+}
+
+#elif defined(TOOLKIT_VIEWS)
+// static
+void WebsiteSettings::Show(views::View* anchor_view,

[tfarina, 2012/05/29 19:38:57]

you should implement this function in
chrome/browser/ui/views/website_settings_popup_view.cc

same thing for the gtk version.

[Finnur, 2012/05/30 11:20:04]

Agree.

On 2012/05/29 19:38:57, tfarina wrote:

[markusheintz_, 2012/06/05 17:02:12]

Obsolete since http://codereview.chromium.org/10440092/

[markusheintz_, 2012/06/05 17:02:12]

Obsolete since http://codereview.chromium.org/10440092/

+                           Profile* profile,
+                           TabContentsWrapper* tab_contents_wrapper,
+                           const GURL& url,
+                           const content::SSLStatus& ssl) {
+  new WebsiteSettings(new WebsiteSettingsPopupView(
+                      anchor_view, profile, tab_contents_wrapper),
+                      profile,
+                      tab_contents_wrapper->content_settings(),
+                      url,
+                      ssl,
+                      content::CertStore::GetInstance());
+}
 #endif
-}