[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..a66346cbdc72b61f10bd3f89893c29614e7b19ed 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,7 +55,7 @@ using MediaMenuPartsMap =
 
 // Manages a "content blocked" bubble.
 @interface ContentSettingBubbleController : OmniboxDecorationBubbleController {
- @private
+ @protected
   IBOutlet NSTextField* titleLabel_;
   IBOutlet NSTextField* messageLabel_;
   IBOutlet NSMatrix* allowBlockRadioGroup_;
@@ -64,12 +64,14 @@ using MediaMenuPartsMap =
   IBOutlet NSButton* doneButton_;
   IBOutlet NSButton* loadButton_;
 
+  std::unique_ptr<ContentSettingBubbleModel> contentSettingBubbleModel_;
+
+ @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,15 @@ using MediaMenuPartsMap =
   ContentSettingDecoration* decoration_;  // weak
 }
 
+// Initializes the controller using the model. Takes ownership of
+// |settingsBubbleModel| but not of the other objects.

[Robert Sesek, 2017/05/03 22:05:11]

Add a note that this is used for subclasses and that most callers should use the
class convenience constructor.

[shivanisha, 2017/05/04 20:20:57]

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 +99,9 @@ parentWindow:(NSWindow*)parentWindow
   decoration:(ContentSettingDecoration*)decoration
   anchoredAt:(NSPoint)anchoredAt;
 
+// Initializes the layout of all the UI elements.
+- (void)layoutView;
+
 // Callback for the "don't block / continue blocking" radio group.
 - (IBAction)allowBlockToggled:(id)sender;