Remove MaskedViewTargeter and its derived classes

chrome/browser/ui/views/tabs/tab_strip.cc

 // Copyright (c) 2012 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/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 29 matching lines @@
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/image_view.h"
-#include "ui/views/masked_view_targeter.h"
 #include "ui/views/mouse_watcher_view_host.h"
 #include "ui/views/rect_based_targeting_utils.h"
 #include "ui/views/view_model_utils.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/win/hwnd_util.h"
 #include "ui/views/widget/monitor_win.h"
@@ skipping 228 matching lines @@
     *destroyed_ = true;
 }
 
 bool NewTabButton::HasHitTestMask() const {
   // When the button is sized to the top of the tab strip we want the user to
   // be able to click on complete bounds, and so don't return a custom hit
   // mask.
   return !tab_strip_->SizeTabButtonToTopOfTabStrip();
 }
 
-// TODO(tdanderson): Move the implementation into View::HitTestRect() and
-//                   delete this function. See crbug.com/377527.
 void NewTabButton::GetHitTestMask(HitTestSource source, gfx::Path* path) const {
-  const ui::EventTargeter* targeter = GetEventTargeter();
-  DCHECK(targeter);
-  static_cast<const views::MaskedViewTargeter*>(targeter)
-      ->GetHitTestMask(this, path);
+  DCHECK(path);
+
+  SkScalar w = SkIntToScalar(width());
+  SkScalar v_offset = SkIntToScalar(TabStrip::kNewTabButtonVerticalOffset);
+
+  // These values are defined by the shape of the new tab image. Should that
+  // image ever change, these values will need to be updated. They're so
+  // custom it's not really worth defining constants for.
+  // These values are correct for regular and USE_ASH versions of the image.
+  path->moveTo(0, v_offset + 1);
+  path->lineTo(w - 7, v_offset + 1);
+  path->lineTo(w - 4, v_offset + 4);
+  path->lineTo(w, v_offset + 16);
+  path->lineTo(w - 1, v_offset + 17);
+  path->lineTo(7, v_offset + 17);
+  path->lineTo(4, v_offset + 13);
+  path->lineTo(0, v_offset + 1);
+  path->close();
 }
 
 #if defined(OS_WIN)
 void NewTabButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (event.IsOnlyRightMouseButton()) {
     gfx::Point point = event.location();
     views::View::ConvertPointToScreen(this, &point);
     bool destroyed = false;
     destroyed_ = &destroyed;
     gfx::ShowSystemMenuAtPoint(views::HWNDForView(this), point);
@@ skipping 124 matching lines @@
 
 gfx::ImageSkia NewTabButton::GetImageForScale(float scale) const {
   if (!hover_animation_->is_animating())
     return GetImageForState(state(), scale);
   return gfx::ImageSkiaOperations::CreateBlendedImage(
       GetImageForState(views::CustomButton::STATE_NORMAL, scale),
       GetImageForState(views::CustomButton::STATE_HOVERED, scale),
       hover_animation_->GetCurrentValue());
 }
 
-// Used to define the custom hit-test region of the new tab button
-// for the purposes of event targeting.
-class NewTabButtonTargeter : public views::MaskedViewTargeter {
- public:
-  explicit NewTabButtonTargeter(views::View* new_tab_button)
-      : views::MaskedViewTargeter(new_tab_button) {}
-  virtual ~NewTabButtonTargeter() {}
-
- private:
-  // views::MaskedViewTargeter:
-  virtual bool GetHitTestMask(const views::View* view,
-                              gfx::Path* mask) const OVERRIDE {
-    DCHECK(mask);
-    DCHECK_EQ(view, masked_view());
-
-    SkScalar w = SkIntToScalar(view->width());
-    SkScalar v_offset = SkIntToScalar(TabStrip::kNewTabButtonVerticalOffset);
-
-    // These values are defined by the shape of the new tab image. Should that
-    // image ever change, these values will need to be updated. They're so
-    // custom it's not really worth defining constants for.
-    // These values are correct for regular and USE_ASH versions of the image.
-    mask->moveTo(0, v_offset + 1);
-    mask->lineTo(w - 7, v_offset + 1);
-    mask->lineTo(w - 4, v_offset + 4);
-    mask->lineTo(w, v_offset + 16);
-    mask->lineTo(w - 1, v_offset + 17);
-    mask->lineTo(7, v_offset + 17);
-    mask->lineTo(4, v_offset + 13);
-    mask->lineTo(0, v_offset + 1);
-    mask->close();
-
-    return true;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(NewTabButtonTargeter);
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip::RemoveTabDelegate
 //
 // AnimationDelegate used when removing a tab. Does the necessary cleanup when
 // done.
 class TabStrip::RemoveTabDelegate : public TabAnimationDelegate {
  public:
   RemoveTabDelegate(TabStrip* tab_strip, Tab* tab);
 
   virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
@@ skipping 992 matching lines @@
                                 kNewTabButtonAssetHeight +
                                     kNewTabButtonVerticalOffset);
   newtab_button_ = new NewTabButton(this, this);
   newtab_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_TOOLTIP_NEW_TAB));
   newtab_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB));
   newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
                                     views::ImageButton::ALIGN_BOTTOM);
   AddChildView(newtab_button_);
-  newtab_button_->SetEventTargeter(
-      scoped_ptr<ui::EventTargeter>(new NewTabButtonTargeter(newtab_button_)));
-
   if (drop_indicator_width == 0) {
     // Direction doesn't matter, both images are the same size.
     gfx::ImageSkia* drop_image = GetDropArrowImage(true);
     drop_indicator_width = drop_image->width();
     drop_indicator_height = drop_image->height();
   }
 }
 
 Tab* TabStrip::CreateTab() {
   Tab* tab = new Tab(this);
@@ skipping 1203 matching lines @@
         action = TouchUMA::GESTURE_TABSWITCH_TAP;
       TouchUMA::RecordGestureAction(action);
       break;
     }
 
     default:
       break;
   }
   event->SetHandled();
 }