MicButton should implement MaskedTargeterDelegate

ui/app_list/views/speech_view.h

 // Copyright 2013 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.
 
 #ifndef UI_APP_LIST_VIEWS_SPEECH_VIEW_H_
 #define UI_APP_LIST_VIEWS_SPEECH_VIEW_H_
 
 #include "ui/app_list/app_list_export.h"
 #include "ui/app_list/speech_ui_model_observer.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/masked_targeter_delegate.h"
 #include "ui/views/view.h"
 
 namespace views {
 class BoundsAnimator;
-class ImageButton;
 class ImageView;
 class Label;
 }
 
 namespace app_list {
 
 class AppListViewDelegate;
 class SpeechCardView;
 
+// MicButton is an image button with circular hit area.
+class APP_LIST_EXPORT MicButton : public views::ImageButton,

[sky, 2014/07/09 19:26:04]

I would keep this in the .cc. That way it's clear this is only used internally
and not meant for general consumption.

[tdanderson, 2014/07/09 20:05:11]

Done. Moving it back into the .cc requires me to use a static_cast when setting
the event targeter, though.

+                                  public views::MaskedTargeterDelegate {
+ public:
+  explicit MicButton(views::ButtonListener* listener);
+  virtual ~MicButton();
+
+ private:
+  // views::MaskedTargeterDelegate:
+  virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(MicButton);
+};
+
 // SpeechView provides the card-like UI for the search-by-speech.
 class APP_LIST_EXPORT SpeechView : public views::View,
                                    public views::ButtonListener,
                                    public SpeechUIModelObserver {
  public:
   explicit SpeechView(AppListViewDelegate* delegate);
   virtual ~SpeechView();
 
   // Reset to the original state.
   void Reset();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
 
-  views::ImageButton* mic_button() { return mic_button_; }
+  MicButton* mic_button() { return mic_button_; }
 
  private:
   int GetIndicatorRadius(uint8 level);
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from SpeechUIModelObserver:
   virtual void OnSpeechSoundLevelChanged(uint8 level) OVERRIDE;
   virtual void OnSpeechResult(const base::string16& result,
                               bool is_final) OVERRIDE;
   virtual void OnSpeechRecognitionStateChanged(
       SpeechRecognitionState new_state) OVERRIDE;
 
   AppListViewDelegate* delegate_;
 
   views::ImageView* logo_;
   views::View* indicator_;
-  views::ImageButton* mic_button_;
+  MicButton* mic_button_;
   views::Label* speech_result_;
   scoped_ptr<views::BoundsAnimator> indicator_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_SPEECH_VIEW_H_