[Mac] Hover/Active Omnibox Icon States for Secondary UI MD

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
 
 #include <algorithm>
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 284 matching lines @@
   NSPoint anchor = GetBubblePointInFrame(frame);
   anchor = [field convertPoint:anchor toView:nil];
   anchor = ui::ConvertPointFromWindowToScreen([field window], anchor);
 
   // Open bubble.
   ContentSettingBubbleModel* model =
       content_setting_image_model_->CreateBubbleModel(
           browser->content_setting_bubble_model_delegate(),
           web_contents,
           profile_);
+  model->set_decoration(this);

[tapted, 2017/05/16 07:39:37]

this doesn't look right - can we just pass |this| through to
ContentSettingBubbleViewsBridge::Show(..) below, and avoid changing the model?

[spqchan, 2017/05/17 01:39:40]

Good point. I implemented a method in LocationBarViewMac that can return the
content setting decoration based on the anchor point.

 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     gfx::Point origin = gfx::ScreenPointFromNSPoint(anchor);
     chrome::ContentSettingBubbleViewsBridge::Show(
         [web_contents->GetTopLevelNativeWindow() contentView],

[tapted, 2017/05/17 01:57:49]

Is there a reason we can't pass |this| to ::Show(..) on this line?

         model, web_contents, origin);
   } else {
     // If the bubble is already opened, close it. Otherwise, open a new bubble.
     if (bubbleWindow_ && [bubbleWindow_ isVisible]) {
       [bubbleWindow_ close];
       bubbleWindow_.reset();
     } else {
       ContentSettingBubbleController* bubbleController =
           [ContentSettingBubbleController showForModel:model
                                            webContents:web_contents
                                           parentWindow:[field window]
                                             decoration:this

[tapted, 2017/05/17 01:57:49]

i.e. similar to the call here, for Cocoa

                                             anchoredAt:anchor];
       bubbleWindow_.reset([[bubbleController window] retain]);
     }
   }
 
   return true;
 }
 
 CGFloat ContentSettingDecoration::DividerPadding() const {
   return kDividerPadding;
@@ skipping 106 matching lines @@
 }
 
 void ContentSettingDecoration::AnimationTimerFired() {
   owner_->Layout();
   // Even after the animation completes, the |animator_| object should be kept
   // alive to prevent the animation from re-appearing if the page opens
   // additional popups later. The animator will be cleared when the decoration
   // hides, indicating something has changed with the WebContents (probably
   // navigation).
 }