Fix SharingIcon visibility on ChromeOS.

The ClickToCall icon in the omnibox is attached to the
IntentPickerBubbleView on ChromeOS. We need to check that the bubble is
actually intended for ClickToCall though and only do that for
ClickToCall and not other sharing features.

Bug: 1013112
Change-Id: Id6d8b84f5e69189748b620b64cacc34453876501
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1852247Reviewed-by: Alex Chau <alexchau@chromium.org>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705494}

chrome/browser/ui/views/intent_picker_bubble_view.h

@@ -92,6 +92,8 @@ class IntentPickerBubbleView : public LocationBarBubbleDelegateView,
   bool ShouldShowCloseButton() const override;
   int GetDialogButtons() const override;
 
+  PageActionIconType icon_type() const { return icon_type_; }
+
  protected:
   // LocationBarBubbleDelegateView overrides:
   base::string16 GetWindowTitle() const override;

chrome/browser/ui/views/page_action/page_action_icon_container_view.cc

@@ -57,7 +57,7 @@ PageActionIconContainerView::PageActionIconContainerView(const Params& params)
                   ClickToCallUiController::GetOrCreateFromWebContents(
                       contents));
             }),
-            base::BindRepeating(SharingDialogView::GetAsBubble));
+            base::BindRepeating(SharingDialogView::GetAsBubbleForClickToCall));
         page_action_icons_.push_back(click_to_call_icon_);
         break;
       case PageActionIconType::kCookieControls:

chrome/browser/ui/views/sharing/sharing_dialog_view.cc

@@ -29,6 +29,7 @@
 #include "ui/views/layout/fill_layout.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/page_action/page_action_icon_type.h"
 #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
 #endif
 
@@ -315,9 +316,18 @@ void SharingDialogView::WindowClosing() {
 // static
 views::BubbleDialogDelegateView* SharingDialogView::GetAsBubble(
     SharingDialog* dialog) {
+  return static_cast<SharingDialogView*>(dialog);
+}
+
+// static
+views::BubbleDialogDelegateView* SharingDialogView::GetAsBubbleForClickToCall(
+    SharingDialog* dialog) {
 #if defined(OS_CHROMEOS)
-  if (!dialog)
-    return IntentPickerBubbleView::intent_picker_bubble();
+  if (!dialog) {
+    auto* bubble = IntentPickerBubbleView::intent_picker_bubble();
+    if (bubble && bubble->icon_type() == PageActionIconType::kClickToCall)
+      return bubble;
+  }
 #endif
   return static_cast<SharingDialogView*>(dialog);
 }

chrome/browser/ui/views/sharing/sharing_dialog_view.h

@@ -59,6 +59,9 @@ class SharingDialogView : public SharingDialog,
 
   static views::BubbleDialogDelegateView* GetAsBubble(SharingDialog* dialog);
 
+  static views::BubbleDialogDelegateView* GetAsBubbleForClickToCall(
+      SharingDialog* dialog);
+
  private:
   friend class SharingDialogViewTest;
   FRIEND_TEST_ALL_PREFIXES(SharingDialogViewTest, PopulateDialogView);

chrome/browser/ui/views/sharing/sharing_icon_view.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/sharing/sharing_icon_view.h"
+
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "components/vector_icons/vector_icons.h"
 #include "ui/base/l10n/l10n_util.h"