Update chooser bubble ui cocoa code

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 <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 49 matching lines @@
   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_;
 
   Browser* browser_;                                // Weak.
-  ChooserBubbleDelegate* chooser_bubble_delegate_;  // Weak.
+  ChooserBubbleDelegate* chooserBubbleDelegate_;    // Weak.
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
 - (id)initWithBrowser:(Browser*)browser
-    initWithChooserBubbleDelegate:
-        (ChooserBubbleDelegate*)chooser_bubble_delegate
+    initWithChooserBubbleDelegate:(ChooserBubbleDelegate*)chooserBubbleDelegate
                            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.
@@ skipping 38 matching lines @@
 - (void)onConnect:(id)sender;
 
 // Called when the "Cancel" button is pressed.
 - (void)onCancel:(id)sender;
 
 @end
 
 @implementation ChooserBubbleUiController
 
 - (id)initWithBrowser:(Browser*)browser
-    initWithChooserBubbleDelegate:
-        (ChooserBubbleDelegate*)chooser_bubble_delegate
+    initWithChooserBubbleDelegate:(ChooserBubbleDelegate*)chooserBubbleDelegate
                            bridge:(ChooserBubbleUiCocoa*)bridge {
   DCHECK(browser);
-  DCHECK(chooser_bubble_delegate);
+  DCHECK(chooserBubbleDelegate);
   DCHECK(bridge);
 
-  if (browser == nil || chooser_bubble_delegate == nil || bridge == nil)
-    return nil;
-
   browser_ = browser;
-  chooser_bubble_delegate_ = chooser_bubble_delegate;
+  chooserBubbleDelegate_ = chooserBubbleDelegate;
 
   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 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];

[Robert Sesek, 2015/12/15 18:16:00]

Limit this too to just the observer that was registered in -init….

[juncai, 2015/12/15 18:24:11]

Done.

   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]];
 }
 
 - (void)parentWindowDidMove:(NSNotification*)notification {
   DCHECK(bridge_);
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
 }
 
 - (void)show {
   NSView* view = [[self window] contentView];
-  [view setSubviews:@[]];
 
   // ------------------------------------
   // | Chooser bubble title             |
   // | -------------------------------- |
   // | | option 0                     | |
   // | | option 1                     | |
   // | | option 2                     | |
   // | |                              | |
   // | |                              | |
   // | |                              | |
@@ skipping 85 matching lines @@
     [[self window] setFrame:bubbleFrame display:NO];
     [self setAnchorPoint:[self getExpectedAnchorPoint]];
     [self showWindow:nil];
     [[self window] makeFirstResponder:nil];
     [[self window] setInitialFirstResponder:connectButton_.get()];
   }
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
   const std::vector<base::string16>& device_names =
-      chooser_bubble_delegate_->GetOptions();
+      chooserBubbleDelegate_->GetOptions();
   if (device_names.empty()) {
     return 1;
   } else {
     return static_cast<NSInteger>(device_names.size());
   }
 }
 
 - (id)tableView:(NSTableView*)tableView
     objectValueForTableColumn:(NSTableColumn*)tableColumn
                           row:(NSInteger)rowIndex {
   const std::vector<base::string16>& device_names =
-      chooser_bubble_delegate_->GetOptions();
+      chooserBubbleDelegate_->GetOptions();
   if (device_names.empty()) {
     DCHECK(rowIndex == 0);
     return l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT);
   } else {
     if (rowIndex >= 0 &&
         rowIndex < static_cast<NSInteger>(device_names.size())) {
       return base::SysUTF16ToNSString(device_names[rowIndex]);
     } else {
       return @"";
     }
@@ skipping 19 matching lines @@
   // 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 {
   const std::vector<base::string16>& device_names =
-      chooser_bubble_delegate_->GetOptions();
+      chooserBubbleDelegate_->GetOptions();
   [tableView_ setEnabled:!device_names.empty()];
   [tableView_ reloadData];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification*)aNotification {
   [connectButton_ setEnabled:[tableView_ numberOfSelectedRows] > 0];
 }
 
 - (void)updateAnchorPosition {
   [self setParentWindow:[self getExpectedParentWindow]];
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
 }
 
 - (NSPoint)getExpectedAnchorPoint {
   NSPoint anchor;
   if ([self hasLocationBar]) {
-    LocationBarViewMac* location_bar =
+    LocationBarViewMac* locationBar =
         [[[self getExpectedParentWindow] windowController] locationBarBridge];
-    anchor = location_bar->GetPageInfoBubblePoint();
+    anchor = locationBar->GetPageInfoBubblePoint();
   } else {
     // Center the bubble if there's no location bar.
     NSRect contentFrame = [[[self getExpectedParentWindow] contentView] frame];
     anchor = NSMakePoint(NSMidX(contentFrame), NSMaxY(contentFrame));
   }
 
   return [[self getExpectedParentWindow] convertBaseToScreen:anchor];
 }
 
 - (bool)hasLocationBar {
@@ skipping 61 matching lines @@
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   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 {
   NSInteger row = [tableView_ selectedRow];
-  chooser_bubble_delegate_->Select(row);
+  chooserBubbleDelegate_->Select(row);
   [self close];
 }
 
 - (void)onCancel:(id)sender {
-  chooser_bubble_delegate_->Cancel();
+  chooserBubbleDelegate_->Cancel();
   [self close];
 }
 
 @end
 
 ChooserBubbleUiCocoa::ChooserBubbleUiCocoa(
     Browser* browser,
     ChooserBubbleDelegate* chooser_bubble_delegate)
     : browser_(browser),
       chooser_bubble_delegate_(chooser_bubble_delegate),
       chooser_bubble_ui_controller_(nil) {
   DCHECK(browser);
   DCHECK(chooser_bubble_delegate);
   chooser_bubble_delegate_->set_observer(this);
 }
 
 ChooserBubbleUiCocoa::~ChooserBubbleUiCocoa() {
   chooser_bubble_delegate_->set_observer(nullptr);
-  if (chooser_bubble_ui_controller_) {
-    [chooser_bubble_ui_controller_ close];
-    chooser_bubble_ui_controller_ = nil;
-  }
+  [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_
         initWithChooserBubbleDelegate:chooser_bubble_delegate_
                                bridge:this];
   }
 
-  if (chooser_bubble_ui_controller_) {
-    [chooser_bubble_ui_controller_ show];
-    [chooser_bubble_ui_controller_ updateTableView];
-  }
+  [chooser_bubble_ui_controller_ show];
+  [chooser_bubble_ui_controller_ updateTableView];
 }
 
 void ChooserBubbleUiCocoa::Close() {
-  if (chooser_bubble_ui_controller_) {
-    [chooser_bubble_ui_controller_ close];
-    chooser_bubble_ui_controller_ = nil;
-  }
+  [chooser_bubble_ui_controller_ close];
+  chooser_bubble_ui_controller_ = nil;
 }
 
 void ChooserBubbleUiCocoa::UpdateAnchorPosition() {
   [chooser_bubble_ui_controller_ updateAnchorPosition];
 }
 
 void ChooserBubbleUiCocoa::OnOptionsInitialized() {
   [chooser_bubble_ui_controller_ onOptionsInitialized];
 }
 
 void ChooserBubbleUiCocoa::OnOptionAdded(int index) {
   [chooser_bubble_ui_controller_ onOptionAdded:index];
 }
 
 void ChooserBubbleUiCocoa::OnOptionRemoved(int index) {
   [chooser_bubble_ui_controller_ onOptionRemoved:index];
 }
 
 void ChooserBubbleUiCocoa::OnBubbleClosing() {
   chooser_bubble_ui_controller_ = nil;
 }