Reusing Ok/Cancel buttons for intent picker

chrome/browser/ui/views/intent_picker_bubble_view.h

Index: chrome/browser/ui/views/intent_picker_bubble_view.h
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.h b/chrome/browser/ui/views/intent_picker_bubble_view.h
index 36c0f475f94c0085f10cffd50f0c631aa88b11f2..d3d4f2ac7301eb8561c042a3de83a11a4b39b2c7 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view.h
+++ b/chrome/browser/ui/views/intent_picker_bubble_view.h
@@ -69,10 +69,23 @@ class IntentPickerBubbleView : public views::BubbleDialogDelegateView,
       const ThrottleCallback& throttle_cb,
       content::WebContents* web_contents);
 
+  // views::DialogDelegate overrides:
+  bool Accept() override;
+  bool Cancel() override;
+  bool Close() override;
+  int GetDefaultDialogButton() const override;
+
  protected:
   // views::BubbleDialogDelegateView overrides:
   void Init() override;
 
+  // views::DialogDelegate overrides:
+  bool IsDialogButtonEnabled(ui::DialogButton button) const override;
+
+  // views::WidgetDelegate overrides:
+  base::string16 GetWindowTitle() const override;
+  base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
+
  private:
   friend class IntentPickerBubbleViewTest;
   FRIEND_TEST_ALL_PREFIXES(IntentPickerBubbleViewTest, NullIcons);
@@ -84,7 +97,6 @@ class IntentPickerBubbleView : public views::BubbleDialogDelegateView,
 
   // views::BubbleDialogDelegateView overrides:
   void OnWidgetDestroying(views::Widget* widget) override;
-  int GetDialogButtons() const override;
 
   // views::ButtonListener overrides:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
@@ -95,14 +107,11 @@ class IntentPickerBubbleView : public views::BubbleDialogDelegateView,
   // content::WebContentsObserver overrides:
   void WebContentsDestroyed() override;
 
-  // Retrieves the LabelButton* contained at position |index| from the internal
-  // ScrollView.
+  // Retrieves the IntentPickerMenuButton* contained at position |index| from
+  // the internal ScrollView.
   views::LabelButton* GetLabelButtonAt(size_t index);
   void SetLabelButtonBackgroundColor(size_t index, SkColor color);
-
-  // Flag set to true iff the callback was Run at some previous step, used to
-  // ensure we only use the callback once.
-  bool was_callback_run_;
+  gfx::ImageSkia GetAppImageForTesting(size_t index);
 
   // Callback used to respond to ArcNavigationThrottle.
   ThrottleCallback throttle_cb_;
@@ -110,8 +119,6 @@ class IntentPickerBubbleView : public views::BubbleDialogDelegateView,
   // Keeps a invalid value unless the user explicitly makes a decision.
   size_t selected_app_tag_;
 
-  views::LabelButton* always_button_;
-  views::LabelButton* just_once_button_;
   views::ScrollView* scroll_view_;
 
   std::vector<NameAndIcon> app_info_;