Introduce the MicButtonTargeter class

ui/app_list/views/speech_view.cc

 // 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.
 
 #include "ui/app_list/views/speech_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/masked_view_targeter.h"
 #include "ui/views/shadow_border.h"
 
 namespace app_list {
 
 namespace {
 
 const int kShadowOffset = 1;
 const int kShadowBlur = 4;
 const int kSpeechViewMaxHeight = 300;
 const int kMicButtonMargin = 12;
@@ skipping 54 matching lines @@
 
 MicButton::MicButton(views::ButtonListener* listener)
     : views::ImageButton(listener) {}
 
 MicButton::~MicButton() {}
 
 bool MicButton::HasHitTestMask() const {
   return true;
 }
 
+// TODO(tdanderson): Move the implementation into views::View::HitTestRect()
+//                   and delete this function. See crbug.com/377527.
 void MicButton::GetHitTestMask(views::View::HitTestSource source,
                                gfx::Path* mask) const {
-  // The mic button icon is a circle. |source| doesn't matter.
-  gfx::Rect local_bounds = GetLocalBounds();
-  int radius = local_bounds.width() / 2 + kIndicatorRadiusMinOffset;
-  gfx::Point center = local_bounds.CenterPoint();
-  center.set_y(center.y() + kIndicatorCenterOffsetY);
-  mask->addCircle(SkIntToScalar(center.x()),
-                  SkIntToScalar(center.y()),
-                  SkIntToScalar(radius));
+  ui::EventTargeter* targeter = GetEventTargeter();
+  CHECK(targeter);
+
+  MicButton* b = const_cast<MicButton*>(this);
+  static_cast<views::MaskedViewTargeter*>(targeter)->GetHitTestMask(b, mask);
 }
 
+// Used to define the circular hit test region of a MicButton for the
+// purposes of event targeting.
+class MicButtonTargeter : public views::MaskedViewTargeter {
+ public:
+  explicit MicButtonTargeter(views::View* mic_button)
+      : views::MaskedViewTargeter(mic_button) {
+  }
+  virtual ~MicButtonTargeter() {}
+
+ private:
+  virtual bool GetHitTestMask(views::View* view,
+                              gfx::Path* mask) const OVERRIDE {
+    // The mic button icon is a circle.
+    gfx::Rect local_bounds = view->GetLocalBounds();
+    int radius = local_bounds.width() / 2 + kIndicatorRadiusMinOffset;
+    gfx::Point center = local_bounds.CenterPoint();
+    center.set_y(center.y() + kIndicatorCenterOffsetY);
+    mask->addCircle(SkIntToScalar(center.x()),
+                    SkIntToScalar(center.y()),
+                    SkIntToScalar(radius));
+    return true;
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(MicButtonTargeter);
+};
+
 }  // namespace
 
 // static
 
 SpeechView::SpeechView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       logo_(NULL) {
   SetBorder(scoped_ptr<views::Border>(
       new views::ShadowBorder(kShadowBlur,
                               kShadowColor,
@@ skipping 13 matching lines @@
     logo_->SetImage(&logo_image);
     container->AddChildView(logo_);
   }
 
   indicator_ = new SoundLevelIndicator();
   indicator_->SetVisible(false);
   container->AddChildView(indicator_);
 
   mic_button_ = new MicButton(this);
   container->AddChildView(mic_button_);
+  mic_button_->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
+      new MicButtonTargeter(mic_button_)));
 
   // TODO(mukai): use BoundedLabel to cap 2 lines.
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   speech_result_ = new views::Label(
       base::string16(), bundle.GetFontList(ui::ResourceBundle::LargeFont));
   speech_result_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   speech_result_->SetMultiLine(true);
   container->AddChildView(speech_result_);
 
@@ skipping 88 matching lines @@
     resource_id = IDR_APP_LIST_SPEECH_MIC_ON;
   else if (new_state == SPEECH_RECOGNITION_IN_SPEECH)
     resource_id = IDR_APP_LIST_SPEECH_MIC_RECORDING;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   mic_button_->SetImage(views::Button::STATE_NORMAL,
                         bundle.GetImageSkiaNamed(resource_id));
 }
 
 }  // namespace app_list