Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7244)

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 10440092: Remove any platform specific code from the chrome/browser/website_settings.* . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..18c965386caf27c766b2750de7a7e24e39d3af4a 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,11 @@ 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/05/31 17:34:19 This works for me. But it isn't what I suggested.
+ profile,
+ tab_contents_wrapper,
+ url,
+ ssl);
}
void BrowserWindowGtk::ShowAppMenu() {
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/website_settings_popup_gtk.h » ('j') | chrome/browser/ui/gtk/website_settings_popup_gtk.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698