Make ChromeExtensionChooserDialog::ShowDialog work for MacViews

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

 // Copyright 2015 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #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"
 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bubble/bubble_controller.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
   return base::WrapUnique(
       new ChooserBubbleUiCocoa(browser_, chooser_controller()));
 }
 
 @interface ChooserBubbleUiController
     : BaseBubbleController<NSTableViewDataSource, NSTableViewDelegate> {
  @private
   // Bridge to the C++ class that created this object.
   ChooserBubbleUiCocoa* bridge_;  // Weak.
   bool buttonPressed_;
 
-  base::scoped_nsobject<ChooserContentView> chooserContentView_;
+  base::scoped_nsobject<ChooserContentViewCocoa> chooserContentViewCocoa_;
   NSTableView* tableView_;   // Weak.
   NSButton* connectButton_;  // Weak.
   NSButton* cancelButton_;   // Weak.
   NSButton* helpButton_;     // Weak.
 
   Browser* browser_;                      // Weak.
   ChooserController* chooserController_;  // Weak.
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
@@ skipping 101 matching lines @@
 - (void)parentWindowDidResize:(NSNotification*)notification {
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
 }
 
 - (void)parentWindowDidMove:(NSNotification*)notification {
   DCHECK(bridge_);
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
 }
 
 - (void)show {
-  chooserContentView_.reset([[ChooserContentView alloc]
+  chooserContentViewCocoa_.reset([[ChooserContentViewCocoa alloc]
       initWithChooserTitle:
           l10n_util::GetNSStringF(
               IDS_CHOOSER_BUBBLE_PROMPT,
               url_formatter::FormatOriginForSecurityDisplay(
                   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:)];
   [cancelButton_ setTarget:self];
   [cancelButton_ setAction:@selector(onCancel:)];
   [tableView_ setDelegate:self];
   [tableView_ setDataSource:self];
   [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
     // manually adjusting the new frame's origin so that the top left stays the
     // same, and only calling -setFrame.
     NSRect currentWindowFrame = [[self window] frame];
     bubbleFrame.origin = currentWindowFrame.origin;
     bubbleFrame.origin.y = bubbleFrame.origin.y +
                            currentWindowFrame.size.height -
                            bubbleFrame.size.height;
@@ skipping 188 matching lines @@
   [chooser_bubble_ui_controller_ onOptionAdded:static_cast<NSInteger>(index)];
 }
 
 void ChooserBubbleUiCocoa::OnOptionRemoved(size_t index) {
   [chooser_bubble_ui_controller_ onOptionRemoved:static_cast<NSInteger>(index)];
 }
 
 void ChooserBubbleUiCocoa::OnBubbleClosing() {
   chooser_bubble_ui_controller_ = nil;
 }