chrome/browser/ui/views/autofill/decorated_textfield.cc - Issue 120503005: Merge NativeTextfieldViews into views::Textfield.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 120503005: Merge NativeTextfieldViews into views::Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename GetText to text. Created 6 years, 11 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:

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 fa3e816f95fbd7497dd65912d21bc21fb2063b31..db9f64b67516f72d1643368b219d2a7763357d9f 100644

--- a/chrome/browser/ui/views/autofill/decorated_textfield.cc

+++ b/chrome/browser/ui/views/autofill/decorated_textfield.cc

@@ -10,7 +10,6 @@

#include "ui/views/background.h"

#include "ui/views/controls/button/label_button.h"

#include "ui/views/controls/focusable_border.h"

-#include "ui/views/controls/textfield/native_textfield_views.h"

#include "ui/views/controls/textfield/textfield_controller.h"

namespace {

@@ -125,7 +124,7 @@ views::View* DecoratedTextfield::GetEventHandlerForRect(const gfx::Rect& rect) {

views::View* handler = views::Textfield::GetEventHandlerForRect(rect);

if (handler->GetClassName() == TooltipIcon::kViewClassName)

return handler;

- return textfield_view_;

+ return this;

}

void DecoratedTextfield::OnFocus() {