Make ChromeExtensionChooserDialog::ShowDialog work for MacViews

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

Index: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm
index 93b445623d532f7df6e195003388c913be2a082a..fdfa58fb9eca40774bb16ced56d1b5d64c49ad7f 100644
--- a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm
+++ b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm
@@ -18,7 +18,7 @@
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
-#import "chrome/browser/ui/cocoa/chooser_content_view.h"
+#import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
@@ -46,7 +46,7 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
   ChooserBubbleUiCocoa* bridge_;  // Weak.
   bool buttonPressed_;
 
-  base::scoped_nsobject<ChooserContentView> chooserContentView_;
+  base::scoped_nsobject<ChooserContentViewCocoa> chooserContentViewCocoa_;
   NSTableView* tableView_;   // Weak.
   NSButton* connectButton_;  // Weak.
   NSButton* cancelButton_;   // Weak.
@@ -168,7 +168,7 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
 }
 
 - (void)show {
-  chooserContentView_.reset([[ChooserContentView alloc]
+  chooserContentViewCocoa_.reset([[ChooserContentViewCocoa alloc]
       initWithChooserTitle:
           l10n_util::GetNSStringF(
               IDS_CHOOSER_BUBBLE_PROMPT,
@@ -176,10 +176,10 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
                   chooserController_->GetOrigin(),
                   url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC))]);
 
-  tableView_ = [chooserContentView_ tableView];
-  connectButton_ = [chooserContentView_ connectButton];
-  cancelButton_ = [chooserContentView_ cancelButton];
-  helpButton_ = [chooserContentView_ helpButton];
+  tableView_ = [chooserContentViewCocoa_ tableView];
+  connectButton_ = [chooserContentViewCocoa_ connectButton];
+  cancelButton_ = [chooserContentViewCocoa_ cancelButton];
+  helpButton_ = [chooserContentViewCocoa_ helpButton];
 
   [connectButton_ setTarget:self];
   [connectButton_ setAction:@selector(onConnect:)];
@@ -190,10 +190,10 @@ std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
   [helpButton_ setTarget:self];
   [helpButton_ setAction:@selector(onHelpPressed:)];
 
-  [[[self window] contentView] addSubview:chooserContentView_.get()];
+  [[[self window] contentView] addSubview:chooserContentViewCocoa_.get()];
 
   NSRect bubbleFrame =
-      [[self window] frameRectForContentRect:[chooserContentView_ frame]];
+      [[self window] frameRectForContentRect:[chooserContentViewCocoa_ frame]];
   if ([[self window] isVisible]) {
     // Unfortunately, calling -setFrame followed by -setFrameOrigin  (called
     // within -setAnchorPoint) causes flickering.  Avoid the flickering by