[subresource_filter] Mac UI updated and xib replaced with code based layout.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
index a7c7fb25dfb9880bcf56a0f7b187fc4d56b36f09..ff6e23463be343f076a8f87e945249715eb43344 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h
@@ -55,21 +55,23 @@ using MediaMenuPartsMap =
 
 // Manages a "content blocked" bubble.
 @interface ContentSettingBubbleController : OmniboxDecorationBubbleController {
- @private
+ @protected
   IBOutlet NSTextField* titleLabel_;
   IBOutlet NSTextField* messageLabel_;
   IBOutlet NSMatrix* allowBlockRadioGroup_;
 
   IBOutlet NSButton* manageButton_;
+  IBOutlet NSButton* manageCheckbox_;

[Robert Sesek, 2017/05/02 21:51:47]

Since this is only used in the subclass, I'd recommend moving the instance
variable to there.

[shivanisha, 2017/05/03 18:10:35]

done

   IBOutlet NSButton* doneButton_;
   IBOutlet NSButton* loadButton_;
 
+  std::unique_ptr<ContentSettingBubbleModel> contentSettingBubbleModel_;

[Robert Sesek, 2017/05/02 21:51:47]

nit: blank line after

[shivanisha, 2017/05/03 18:10:35]

done

+ @private
   // The container for the bubble contents of the geolocation bubble.
   IBOutlet NSView* contentsContainer_;
 
   IBOutlet NSTextField* blockedResourcesField_;
 
-  std::unique_ptr<ContentSettingBubbleModel> contentSettingBubbleModel_;
   std::unique_ptr<ContentSettingBubbleWebContentsObserverBridge>
       observerBridge_;
   content_setting_bubble::PopupLinks popupLinks_;
@@ -79,6 +81,14 @@ using MediaMenuPartsMap =
   ContentSettingDecoration* decoration_;  // weak
 }
 
+// Initializes the controller using the model.

[Robert Sesek, 2017/05/02 21:51:47]

Ditto the comments about ownership of the model from below.

[shivanisha, 2017/05/03 18:10:35]

done

+- (id)initWithModel:(ContentSettingBubbleModel*)settingsBubbleModel
+        webContents:(content::WebContents*)webContents
+             window:(NSWindow*)window
+       parentWindow:(NSWindow*)parentWindow
+         decoration:(ContentSettingDecoration*)decoration
+         anchoredAt:(NSPoint)anchoredAt;
+
 // Creates and shows a content blocked bubble. Takes ownership of
 // |contentSettingBubbleModel| but not of the other objects.
 + (ContentSettingBubbleController*)
@@ -88,6 +98,8 @@ parentWindow:(NSWindow*)parentWindow
   decoration:(ContentSettingDecoration*)decoration
   anchoredAt:(NSPoint)anchoredAt;
 
+- (void)initManageDoneButtons;

[Robert Sesek, 2017/05/02 21:51:47]

It's a little odd exposing just this method (it needs a comment, at the least).

Perhaps add a method named -relayoutDialog that calls all the private -initXXX
methods?

[shivanisha, 2017/05/03 18:10:35]

Added a function called layoutView which is also overridden by the sub class and
invoked in awakeFromNib as well.

+
 // Callback for the "don't block / continue blocking" radio group.
 - (IBAction)allowBlockToggled:(id)sender;
 
@@ -109,6 +121,9 @@ parentWindow:(NSWindow*)parentWindow
 // Callback for "media menu" button.
 - (IBAction)mediaMenuChanged:(id)sender;
 
+// Callback for "manage" checkbox button.
+- (IBAction)manageCheckboxChecked:(id)sender;
+
 @end
 
 @interface ContentSettingBubbleController (TestingAPI)