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

Unified Diff: chrome/browser/ui/gtk/website_settings/permission_selector.cc

Issue 11571010: fixed the DCHECK and also corrected the website setting UI for media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Markus' comment and consolidated |web_content_|. Created 8 years 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/website_settings/permission_selector.cc
diff --git a/chrome/browser/ui/gtk/website_settings/permission_selector.cc b/chrome/browser/ui/gtk/website_settings/permission_selector.cc
index de60af01c1b913fa1948a328bfcf03db531bc75f..891a7e327b7acc3369cffc9d5f4c0168bc49d3b2 100644
--- a/chrome/browser/ui/gtk/website_settings/permission_selector.cc
+++ b/chrome/browser/ui/gtk/website_settings/permission_selector.cc
@@ -38,6 +38,7 @@ ContentSetting CommandIdToContentSetting(int command_id) {
} // namespace
PermissionSelector::PermissionSelector(GtkThemeService* theme_service,
+ const GURL& url,
ContentSettingsType type,
ContentSetting setting,
ContentSetting default_setting,
@@ -102,7 +103,7 @@ PermissionSelector::PermissionSelector(GtkThemeService* theme_service,
gtk_button_set_relief(GTK_BUTTON(menu_button_), GTK_RELIEF_NONE);
gtk_box_pack_start(GTK_BOX(widget_), menu_button_, FALSE, FALSE, 0);
- menu_model_.reset(new PermissionMenuModel(this, type, default_setting,
+ menu_model_.reset(new PermissionMenuModel(this, url, type, default_setting,
setting));
MenuGtk::Delegate* delegate = new MenuGtk::Delegate();
menu_.reset(new MenuGtk(delegate, menu_model_.get()));

Powered by Google App Engine
This is Rietveld 408576698