Refactor IntentPickerBubbleView::ShowBubble()

chrome/browser/ui/views/intent_picker_bubble_view.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 32 matching lines @@
 
 // Arbitrary negative values to use as tags on the |always_button_| and
 // |just_once_button_|. These are negative to differentiate from the app's tags
 // which are always >= 0.
 enum class Option : int { ALWAYS = -2, JUST_ONCE };
 
 }  // namespace
 
 // static
 void IntentPickerBubbleView::ShowBubble(
-    content::NavigationHandle* handle,
+    content::WebContents* contents,

[djacobo_, 2016/09/14 17:16:53]

nit: other parts of the class refer to |web_contents| instead of just
|contents|, I think it would be a bit cleaner to use |web_contents| in all the
class.

[Yusuke Sato, 2016/09/14 18:15:55]

Done.

     const std::vector<NameAndIcon>& app_info,
     const ThrottleCallback& throttle_cb) {
-  Browser* browser =
-      chrome::FindBrowserWithWebContents(handle->GetWebContents());
+  Browser* browser = chrome::FindBrowserWithWebContents(contents);
   if (!browser) {
     throttle_cb.Run(kAppTagNoneSelected,
                     arc::ArcNavigationThrottle::CloseReason::ERROR);
     return;
   }
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   if (!browser_view) {
     throttle_cb.Run(kAppTagNoneSelected,
                     arc::ArcNavigationThrottle::CloseReason::ERROR);
     return;
   }
 
-  IntentPickerBubbleView* delegate = new IntentPickerBubbleView(
-      app_info, throttle_cb, handle->GetWebContents());
+  IntentPickerBubbleView* delegate =
+      new IntentPickerBubbleView(app_info, throttle_cb, contents);
   delegate->set_margins(gfx::Insets());
   delegate->set_parent_window(browser_view->GetNativeWindow());
   views::Widget* widget =
       views::BubbleDialogDelegateView::CreateBubble(delegate);
 
   delegate->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
   delegate->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
 
   // Using the TopContainerBoundsInScreen Rect to specify an anchor for the the
   // UI. Rect allow us to set the coordinates(x,y), the width and height for the
@@ skipping 227 matching lines @@
   views::View* temp_contents = scroll_view_->contents();
   return static_cast<views::LabelButton*>(temp_contents->child_at(index));
 }
 
 void IntentPickerBubbleView::SetLabelButtonBackgroundColor(size_t index,
                                                            SkColor color) {
   views::LabelButton* temp_lb = GetLabelButtonAt(index);
   temp_lb->set_background(views::Background::CreateSolidBackground(color));
   temp_lb->SchedulePaint();
 }