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

chrome/browser/ui/browser_dialogs.h

Index: chrome/browser/ui/browser_dialogs.h
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index a6aa62be6204da9d4cce4dc47d0eda5f4436bb99..0011f996932a84324b11f296162c13a399094f36 100644
--- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h
@@ -21,6 +21,10 @@
 #include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h"
 #endif  // OS_CHROMEOS
 
+#if defined(OS_MACOSX)
+class LocationBarDecoration;
+#endif
+
 class Browser;
 class ContentSettingBubbleModel;
 class GURL;
@@ -123,7 +127,8 @@ void ShowPageInfoBubbleViewsAtPoint(
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& virtual_url,
-    const security_state::SecurityInfo& security_info);
+    const security_state::SecurityInfo& security_info,
+    LocationBarDecoration* decoration);

[sky, 2017/05/19 14:53:22]

The code in c/b/ui shouldn't know about platform specific classes such as
LocationBarDecoration. Is there some other way to inject the decoration? I'm not
clear on why you need decoration here? Presumably only the mac code is going to
be calling this, so can't the mac code call the function defined in the mac
side? I'm suggesting you leave this functions as is here and in the mac code you
define the function that takes a decoration.

[spqchan, 2017/05/19 17:44:55]

Done.

[tapted, 2017/05/21 08:15:28]

Ooh interesting. I think the fact that we can even pass a LocationBarDecoration*
in to these methods (which only exists in a Cocoa browser window), is an
indication that these declarations are just in the wrong place, and should be
moved under c/b/ui/cocoa.

I toyed around with PatchSet 6 in https://codereview.chromium.org/2899583002/ -
I think that's what we want.

Basically it's move: chrome/browser/ui/{views =>
cocoa}/browser_dialogs_views_mac.cc - then we make a
chrome/browser/ui/cocoa/browser_dialogs_views_mac.h to match, which has the
declarations that are only in use by the cocoa browser and can be deleted when
things shift to mac_views_browser

 
 // Show a Views bookmark bubble at the given point. This occurs when the
 // bookmark star is clicked or "Bookmark This Page..." is selected from a menu
@@ -133,7 +138,8 @@ void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point,
                                     bookmarks::BookmarkBubbleObserver* observer,
                                     Browser* browser,
                                     const GURL& url,
-                                    bool newly_bookmarked);
+                                    bool newly_bookmarked,
+                                    LocationBarDecoration* decoration);
 
 // Shows a views zoom bubble at the |anchor_point|. This occurs when the zoom
 // icon is clicked or when a shortcut key is pressed or whenever |web_contents|
@@ -199,7 +205,9 @@ class ContentSettingBubbleViewsBridge {
   static void Show(gfx::NativeView parent_view,
                    ContentSettingBubbleModel* model,
                    content::WebContents* web_contents,
-                   const gfx::Point& anchor);
+                   const gfx::Point& anchor,
+                   LocationBarDecoration* decoration);
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleViewsBridge);
 };