Refactor ChooserBubbleController

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_finder.h"
 #include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/chrome_style.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/constrained_window/constrained_window_button.h"
-#import "chrome/browser/ui/cocoa/hover_close_button.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"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.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"
@@ skipping 10 matching lines @@
 // border.
 const CGFloat kMarginX = 20.0f;
 const CGFloat kMarginY = 20.0f;
 
 // Distance between two views inside the bubble.
 const CGFloat kHorizontalPadding = 10.0f;
 const CGFloat kVerticalPadding = 10.0f;
 
 }  // namespace
 
-std::unique_ptr<BubbleUi> ChooserBubbleController::BuildBubbleUi() {
-  return base::WrapUnique(new ChooserBubbleUiCocoa(browser_, this));
+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_;
 
   base::scoped_nsobject<NSTextField> titleView_;
   base::scoped_nsobject<NSScrollView> scrollView_;
   base::scoped_nsobject<NSTableColumn> tableColumn_;
   base::scoped_nsobject<NSTableView> tableView_;
   base::scoped_nsobject<NSButton> connectButton_;
   base::scoped_nsobject<NSButton> cancelButton_;
   base::scoped_nsobject<NSTextField> message_;
   base::scoped_nsobject<NSButton> getHelpButton_;
   bool buttonPressed_;
 
-  Browser* browser_;                                  // Weak.
-  ChooserBubbleController* chooserBubbleController_;  // Weak.
+  Browser* browser_;                      // Weak.
+  ChooserController* chooserController_;  // Weak.
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
 - (id)initWithBrowser:(Browser*)browser
-    initWithChooserBubbleController:
-        (ChooserBubbleController*)chooserBubbleController
-                             bridge:(ChooserBubbleUiCocoa*)bridge;
+    chooserController:(ChooserController*)chooserController
+      bubbleReference:(BubbleReference)bubbleReference
+               bridge:(ChooserBubbleUiCocoa*)bridge;
 
 // Makes the bubble visible.
 - (void)show;
 
 // Will reposition the bubble based in case the anchor or parent should change.
 - (void)updateAnchorPosition;
 
 // Will calculate the expected anchor point for this bubble.
 // Should only be used outside this class for tests.
 - (NSPoint)getExpectedAnchorPoint;
@@ skipping 46 matching lines @@
 - (void)onCancel:(id)sender;
 
 // Called when the "Get help" button is pressed.
 - (void)onGetHelpPressed:(id)sender;
 
 @end
 
 @implementation ChooserBubbleUiController
 
 - (id)initWithBrowser:(Browser*)browser
-    initWithChooserBubbleController:
-        (ChooserBubbleController*)chooserBubbleController
-                             bridge:(ChooserBubbleUiCocoa*)bridge {
+    chooserController:(ChooserController*)chooserController
+      bubbleReference:(BubbleReference)bubbleReference
+               bridge:(ChooserBubbleUiCocoa*)bridge {
   DCHECK(browser);
-  DCHECK(chooserBubbleController);
+  DCHECK(chooserController);
+  DCHECK(bubbleReference);
   DCHECK(bridge);
 
   browser_ = browser;
-  chooserBubbleController_ = chooserBubbleController;
+  chooserController_ = chooserController;
 
   base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]
       initWithContentRect:ui::kWindowSizeDeterminedLater
                 styleMask:NSBorderlessWindowMask
                   backing:NSBackingStoreBuffered
                     defer:NO]);
   [window setAllowedAnimations:info_bubble::kAnimateNone];
   [window setReleasedWhenClosed:NO];
   if ((self = [super initWithWindow:window
                        parentWindow:[self getExpectedParentWindow]
                          anchoredAt:NSZeroPoint])) {
+    self.bubbleReference = bubbleReference;
     [self setShouldCloseOnResignKey:NO];
     [self setShouldOpenAsKeyWindow:YES];
     [[self bubble] setArrowLocation:[self getExpectedArrowLocation]];
     bridge_ = bridge;
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(parentWindowDidMove:)
                    name:NSWindowDidMoveNotification
                  object:[self getExpectedParentWindow]];
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidMoveNotification
               object:nil];
   if (!buttonPressed_)
-    chooserBubbleController_->Close();
+    chooserController_->Close();
   bridge_->OnBubbleClosing();
   [super windowWillClose:notification];
 }
 
 - (void)parentWindowWillToggleFullScreen:(NSNotification*)notification {
   // Override the base class implementation, which would have closed the bubble.
 }
 
 - (void)parentWindowDidResize:(NSNotification*)notification {
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
@@ skipping 149 matching lines @@
     [self setAnchorPoint:[self getExpectedAnchorPoint]];
     [self showWindow:nil];
     [[self window] makeFirstResponder:nil];
     [[self window] setInitialFirstResponder:tableView_.get()];
   }
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
   // When there are no devices, the table contains a message saying there are
   // no devices, so the number of rows is always at least 1.
-  return std::max(
-      static_cast<NSInteger>(chooserBubbleController_->NumOptions()),
-      static_cast<NSInteger>(1));
+  return std::max(static_cast<NSInteger>(chooserController_->NumOptions()),
+                  static_cast<NSInteger>(1));
 }
 
 - (id)tableView:(NSTableView*)tableView
     objectValueForTableColumn:(NSTableColumn*)tableColumn
                           row:(NSInteger)rowIndex {
   NSInteger num_options =
-      static_cast<NSInteger>(chooserBubbleController_->NumOptions());
+      static_cast<NSInteger>(chooserController_->NumOptions());
   if (num_options == 0) {
     DCHECK_EQ(0, rowIndex);
     return l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT);
   }
 
   DCHECK_GE(rowIndex, 0);
   DCHECK_LT(rowIndex, num_options);
   return base::SysUTF16ToNSString(
-      chooserBubbleController_->GetOption(static_cast<size_t>(rowIndex)));
+      chooserController_->GetOption(static_cast<size_t>(rowIndex)));
 }
 
 - (BOOL)tableView:(NSTableView*)aTableView
     shouldEditTableColumn:(NSTableColumn*)aTableColumn
                       row:(NSInteger)rowIndex {
   return NO;
 }
 
 - (void)onOptionsInitialized {
   [self updateTableView];
 }
 
 - (void)onOptionAdded:(NSInteger)index {
   [self updateTableView];
 }
 
 - (void)onOptionRemoved:(NSInteger)index {
   // |tableView_| will automatically selects the next item if the current
   // item is removed, so here it tracks if the removed item is the item
   // that was previously selected, if so, deselect it.
   if ([tableView_ selectedRow] == index)
     [tableView_ deselectRow:index];
 
   [self updateTableView];
 }
 
 - (void)updateTableView {
-  [tableView_ setEnabled:chooserBubbleController_->NumOptions() > 0];
+  [tableView_ setEnabled:chooserController_->NumOptions() > 0];
   [tableView_ reloadData];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification*)aNotification {
   [connectButton_ setEnabled:[tableView_ numberOfSelectedRows] > 0];
 }
 
 - (void)updateAnchorPosition {
   [self setParentWindow:[self getExpectedParentWindow]];
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
@@ skipping 32 matching lines @@
   base::scoped_nsobject<NSTextField> titleView(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   [titleView setDrawsBackground:NO];
   [titleView setBezeled:NO];
   [titleView setEditable:NO];
   [titleView setSelectable:NO];
   [titleView setStringValue:
                  l10n_util::GetNSStringF(
                      IDS_CHOOSER_BUBBLE_PROMPT,
                      url_formatter::FormatOriginForSecurityDisplay(
-                         chooserBubbleController_->GetOrigin(),
+                         chooserController_->GetOrigin(),
                          url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC))];
   [titleView setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
   // The height is arbitrary as it will be adjusted later.
   [titleView setFrameSize:NSMakeSize(kChooserBubbleWidth - 2 * kMarginX, 0.0f)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:titleView];
   return titleView;
 }
 
 - (base::scoped_nsobject<NSButton>)buttonWithTitle:(NSString*)title
                                             action:(SEL)action {
@@ skipping 60 matching lines @@
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 - (void)onConnect:(id)sender {
   buttonPressed_ = true;
   NSInteger row = [tableView_ selectedRow];
-  chooserBubbleController_->Select(row);
+  chooserController_->Select(row);
+  self.bubbleReference->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
   [self close];
 }
 
 - (void)onCancel:(id)sender {
   buttonPressed_ = true;
-  chooserBubbleController_->Cancel();
+  chooserController_->Cancel();
+  self.bubbleReference->CloseBubble(BUBBLE_CLOSE_CANCELED);
   [self close];
 }
 
 - (void)onGetHelpPressed:(id)sender {
-  chooserBubbleController_->OpenHelpCenterUrl();
+  chooserController_->OpenHelpCenterUrl();
 }
 
 @end
 
 ChooserBubbleUiCocoa::ChooserBubbleUiCocoa(
     Browser* browser,
-    ChooserBubbleController* chooser_bubble_controller)
+    ChooserController* chooser_controller)
     : browser_(browser),
-      chooser_bubble_controller_(chooser_bubble_controller),
+      chooser_controller_(chooser_controller),
       chooser_bubble_ui_controller_(nil) {
   DCHECK(browser);
-  DCHECK(chooser_bubble_controller);
-  chooser_bubble_controller_->set_observer(this);
+  DCHECK(chooser_controller);
+  chooser_controller_->set_observer(this);
 }
 
 ChooserBubbleUiCocoa::~ChooserBubbleUiCocoa() {
-  chooser_bubble_controller_->set_observer(nullptr);
+  chooser_controller_->set_observer(nullptr);
   [chooser_bubble_ui_controller_ close];
   chooser_bubble_ui_controller_ = nil;
 }
 
 void ChooserBubbleUiCocoa::Show(BubbleReference bubble_reference) {
   if (!chooser_bubble_ui_controller_) {
-    chooser_bubble_ui_controller_ = [[ChooserBubbleUiController alloc]
-                        initWithBrowser:browser_
-        initWithChooserBubbleController:chooser_bubble_controller_
-                                 bridge:this];
+    chooser_bubble_ui_controller_ =
+        [[ChooserBubbleUiController alloc] initWithBrowser:browser_
+                                         chooserController:chooser_controller_
+                                           bubbleReference:bubble_reference
+                                                    bridge:this];
   }
 
   [chooser_bubble_ui_controller_ show];
   [chooser_bubble_ui_controller_ updateTableView];
 }
 
 void ChooserBubbleUiCocoa::Close() {
   [chooser_bubble_ui_controller_ close];
   chooser_bubble_ui_controller_ = nil;
 }
@@ skipping 10 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;
 }