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

Unified Diff: chrome/browser/cocoa/content_exceptions_window_controller.h

Issue 4643007: Move click-to-play to about:flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 10 years, 1 month 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/cocoa/content_exceptions_window_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/content_exceptions_window_controller.h
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h
index ede76f7a395cbaffb1b0f5d2b4ec060d56ce2241..98af089dd7d4f3e32046303373d2f099cc35ba38 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
@@ -10,6 +10,7 @@
#include "chrome/common/content_settings_types.h"
class ContentExceptionsTableModel;
+class ContentSettingComboModel;
class UpdatingContentSettingsObserver;
// Controller for the content exception dialogs.
@@ -28,9 +29,7 @@ class UpdatingContentSettingsObserver;
HostContentSettingsMap* settingsMap_; // weak
HostContentSettingsMap* otrSettingsMap_; // weak
scoped_ptr<ContentExceptionsTableModel> model_;
-
- // Is set if "Session" should be a valid option in the "action" popup.
- BOOL showSession_;
+ scoped_ptr<ContentSettingComboModel> popup_model_;
// Is set if adding and editing exceptions for the current OTR session should
// be allowed.
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/cocoa/content_exceptions_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698