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

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

Issue 5238002: Reintegrate 552 r66225-r66645.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552d/src/
Patch Set: '' 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
Index: chrome/browser/cocoa/content_settings_dialog_controller.h
===================================================================
--- chrome/browser/cocoa/content_settings_dialog_controller.h (revision 66837)
+++ chrome/browser/cocoa/content_settings_dialog_controller.h (working copy)
@@ -48,6 +48,7 @@
@private
IBOutlet NSTabView* tabView_;
IBOutlet TabViewPickerTable* tabViewPicker_;
+ IBOutlet NSMatrix* pluginDefaultSettingMatrix_;
Profile* profile_; // weak
IntegerPrefMember lastSelectedTab_;
BooleanPrefMember clearSiteDataOnExit_;
« no previous file with comments | « chrome/browser/cocoa/content_setting_bubble_cocoa.mm ('k') | chrome/browser/cocoa/content_settings_dialog_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698