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

Unified Diff: chrome/browser/ui/website_settings/permission_menu_model.h

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/website_settings/permission_menu_model.h
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.h b/chrome/browser/ui/website_settings/permission_menu_model.h
index 3d6899531ed3444f8a9a904596674cdd229db4fe..0abe7a26edf7f6c4712b9b63d58a5bf3e0fd951d 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.h
+++ b/chrome/browser/ui/website_settings/permission_menu_model.h
@@ -8,6 +8,7 @@
#include "ui/base/models/simple_menu_model.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_types.h"
+#include "googleurl/src/gurl.h"
class PermissionMenuModel : public ui::SimpleMenuModel,
public ui::SimpleMenuModel::Delegate {
@@ -28,6 +29,7 @@ class PermissionMenuModel : public ui::SimpleMenuModel,
};
PermissionMenuModel(Delegate* delegate,
+ const GURL& url,
ContentSettingsType type,
ContentSetting default_setting,
ContentSetting current_setting);
@@ -44,6 +46,9 @@ class PermissionMenuModel : public ui::SimpleMenuModel,
// The delegate of the |PermissionMenuModel|. |delegate_| can be NULL.
Delegate* delegate_;
+ // The URL of the website for which to display site permissions.
+ GURL site_url_;
+
DISALLOW_COPY_AND_ASSIGN(PermissionMenuModel);
};

Powered by Google App Engine
This is Rietveld 408576698