Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(830)

Unified Diff: chrome/browser/ui/views/autofill/decorated_textfield.cc

Issue 403963002: Remove remaining overrides of View::GetEventHandlerForRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/autofill/decorated_textfield.cc
diff --git a/chrome/browser/ui/views/autofill/decorated_textfield.cc b/chrome/browser/ui/views/autofill/decorated_textfield.cc
index 9ca059ea59c57e52f4a13f5d0a5d02cf240cfd24..97ff45a89bc5dab65526892ff90287669a0ee666 100644
--- a/chrome/browser/ui/views/autofill/decorated_textfield.cc
+++ b/chrome/browser/ui/views/autofill/decorated_textfield.cc
@@ -11,6 +11,7 @@
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/focusable_border.h"
#include "ui/views/controls/textfield/textfield_controller.h"
+#include "ui/views/view_targeter.h"
namespace {
@@ -36,6 +37,9 @@ DecoratedTextfield::DecoratedTextfield(
set_placeholder_text(placeholder);
SetText(default_value);
set_controller(controller);
+
+ SetEventTargeter(
+ scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
}
DecoratedTextfield::~DecoratedTextfield() {}
@@ -99,13 +103,6 @@ const char* DecoratedTextfield::GetClassName() const {
return kViewClassName;
}
-views::View* DecoratedTextfield::GetEventHandlerForRect(const gfx::Rect& rect) {
- views::View* handler = views::Textfield::GetEventHandlerForRect(rect);
- if (handler->GetClassName() == TooltipIcon::kViewClassName)
- return handler;
- return this;
-}
-
gfx::Size DecoratedTextfield::GetPreferredSize() const {
static const int height =
views::LabelButton(NULL, base::string16()).GetPreferredSize().height();
@@ -130,6 +127,16 @@ void DecoratedTextfield::Layout() {
}
}
+views::View* DecoratedTextfield::TargetForRect(views::View* root,
+ const gfx::Rect& rect) {
+ CHECK_EQ(root, this);
+
+ views::View* handler = views::ViewTargeterDelegate::TargetForRect(root, rect);
+ if (handler->GetClassName() == TooltipIcon::kViewClassName)
+ return handler;
+ return this;
+}
+
void DecoratedTextfield::UpdateBackground() {
if (editable_)
UseDefaultBackgroundColor();
« no previous file with comments | « chrome/browser/ui/views/autofill/decorated_textfield.h ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698