MicButton should implement MaskedTargeterDelegate

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_targeter_delegate.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 28 matching lines @@
 SoundLevelIndicator::~SoundLevelIndicator() {}
 
 void SoundLevelIndicator::OnPaint(gfx::Canvas* canvas) {
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(kSoundLevelIndicatorColor);
   paint.setAntiAlias(true);
   canvas->DrawCircle(bounds().CenterPoint(), width() / 2, paint);
 }
 
-// MicButton is an image button with circular hit area.
-class MicButton : public views::ImageButton {
+// MicButton is an image button with a circular hit test mask.
+class MicButton : public views::ImageButton,
+                  public views::MaskedTargeterDelegate {
  public:
   explicit MicButton(views::ButtonListener* listener);
   virtual ~MicButton();
 
  private:
-  // Overridden from views::View:
-  virtual bool HasHitTestMask() const OVERRIDE;
-  virtual void GetHitTestMaskDeprecated(views::View::HitTestSource source,
-                                        gfx::Path* mask) const OVERRIDE;
+  // views::MaskedTargeterDelegate:
+  virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(MicButton);
 };
 
 MicButton::MicButton(views::ButtonListener* listener)
     : views::ImageButton(listener) {}
 
 MicButton::~MicButton() {}
 
-bool MicButton::HasHitTestMask() const {
-  return true;
-}
-
-void MicButton::GetHitTestMaskDeprecated(views::View::HitTestSource source,
-                                         gfx::Path* mask) const {
+bool MicButton::GetHitTestMask(gfx::Path* mask) const {
   DCHECK(mask);
 
-  // The mic button icon is a circle. |source| doesn't matter.
+  // The mic button icon is a circle.
   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));
+  return true;
 }
 
 }  // namespace
 
 // static
 
 SpeechView::SpeechView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       logo_(NULL) {
   SetBorder(scoped_ptr<views::Border>(
@@ skipping 15 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<views::ViewTargeter>(
+      new views::ViewTargeter(static_cast<MicButton*>(mic_button_))));

[sky, 2014/07/10 15:46:00]

I'm not a fan of the static_cast here. Could you create a local variable and
then assign the local variable to mic_button_? This way no static_cast.

[tdanderson, 2014/07/10 16:53:45]

Done.

 
   // 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 93 matching lines @@
   }
   speech_result_->SetText(l10n_util::GetStringUTF16(text_resource_id));
   speech_result_->SetEnabledColor(kHintTextColor);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   mic_button_->SetImage(views::Button::STATE_NORMAL,
                         bundle.GetImageSkiaNamed(resource_id));
 }
 
 }  // namespace app_list