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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <map>
@@ skipping 37 matching lines @@
   bool operator()(NSPopUpButton *const a, NSPopUpButton *const b) const {
     return [a tag] < [b tag];
   }
 };
 using MediaMenuPartsMap =
     std::map<NSPopUpButton*, std::unique_ptr<MediaMenuParts>, compare_button>;
 }  // namespace content_setting_bubble
 
 // 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_;
   content_setting_bubble::MediaMenuPartsMap mediaMenus_;
 
   // The omnibox icon the bubble is anchored to.
   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*)
 showForModel:(ContentSettingBubbleModel*)contentSettingBubbleModel
  webContents:(content::WebContents*)webContents
 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;
 
 // Callback for "close" button.
 - (IBAction)closeBubble:(id)sender;
 
 // Callback for "manage" button.
 - (IBAction)manageBlocking:(id)sender;
 
 // Callback for "info" link.
 - (IBAction)showMoreInfo:(id)sender;
 
 // Callback for "load" (plugins, mixed script) button.
 - (IBAction)load:(id)sender;
 
 // Callback for "Learn More" link.
 - (IBAction)learnMoreLinkClicked:(id)sender;
 
 // Callback for "media menu" button.
 - (IBAction)mediaMenuChanged:(id)sender;
 
+// Callback for "manage" checkbox button.
+- (IBAction)manageCheckboxChecked:(id)sender;
+
 @end
 
 @interface ContentSettingBubbleController (TestingAPI)
 
 // Returns the weak reference to the |mediaMenus_|.
 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_COCOA_H_