Chromium Code Reviews| Index: chrome/browser/website_settings.cc |
| diff --git a/chrome/browser/website_settings.cc b/chrome/browser/website_settings.cc |
| index 38ad2adfae32fed274d4be3db9c3d21812215c86..74789b9b433ff323136adcda32dbea7af038cf67 100644 |
| --- a/chrome/browser/website_settings.cc |
| +++ b/chrome/browser/website_settings.cc |
| @@ -43,6 +43,8 @@ |
| #if defined(TOOLKIT_GTK) |
|
Ben Goodger (Google)
2012/05/29 19:54:20
again, toolkit-specific ifdefs are gross, so think
markusheintz_
2012/06/05 17:02:12
Obsolete since http://codereview.chromium.org/1044
|
| #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/DE
markusheintz_
2012/06/05 17:02:12
Obsolete since http://codereview.chromium.org/1044
|
| #endif |
| using content::BrowserThread; |
| @@ -503,13 +505,13 @@ void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) { |
| 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, |
| @@ -519,5 +521,21 @@ void WebsiteSettings::Show(gfx::NativeWindow parent, |
| url, |
| ssl, |
| content::CertStore::GetInstance()); |
| -#endif |
| } |
| + |
| +#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/brows
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/1044
markusheintz_
2012/06/05 17:02:12
Obsolete since http://codereview.chromium.org/1044
|
| + 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 |