Chromium Code Reviews| Index: chrome/browser/ui/gtk/browser_window_gtk.cc |
| diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc |
| index 1bc976a5d3357c0070810067f9965590af0ca921..9b28795994ed5f52faa2b7a9053055be8775d89a 100644 |
| --- a/chrome/browser/ui/gtk/browser_window_gtk.cc |
| +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc |
| @@ -70,6 +70,7 @@ |
| #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| #include "chrome/browser/ui/gtk/task_manager_gtk.h" |
| #include "chrome/browser/ui/gtk/update_recommended_dialog.h" |
| +#include "chrome/browser/ui/gtk/website_settings_popup_gtk.h" |
| #include "chrome/browser/ui/omnibox/location_bar.h" |
| #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| #include "chrome/browser/ui/page_info_bubble.h" |
| @@ -77,7 +78,6 @@ |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" |
| #include "chrome/browser/web_applications/web_app.h" |
| -#include "chrome/browser/website_settings.h" |
| #include "chrome/common/chrome_notification_types.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/pref_names.h" |
| @@ -1139,11 +1139,12 @@ void BrowserWindowGtk::ShowWebsiteSettings( |
| const GURL& url, |
| const content::SSLStatus& ssl, |
| bool show_history) { |
| - WebsiteSettings::Show(GetNativeHandle(), |
| - profile, |
| - tab_contents_wrapper, |
| - url, |
| - ssl); |
| + WebsiteSettingsPopupGtk::Show( |
| + GetNativeHandle(), |
|
tfarina
2012/06/01 21:20:26
nit: like I said in the other comment, you could s
markusheintz_
2012/06/02 21:22:33
I don't have any strong feelings about the style i
|
| + profile, |
| + tab_contents_wrapper, |
| + url, |
| + ssl); |
| } |
| void BrowserWindowGtk::ShowAppMenu() { |