views/controls/textfield/native_textfield_win.cc - Issue 6628037: views: Moves TextfieldController/TextRange into their own headers.

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: views/controls/textfield/native_textfield_win.cc

Issue 6628037: views: Moves TextfieldController/TextRange into their own headers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments Created 9 years, 9 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: views/controls/textfield/native_textfield_win.cc

diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc

index 60c5b564ee941347a68bc1dfb9335e1fcfb6150e..8296e26c113cd47738ce06730b59e302c56d36c6 100644

--- a/views/controls/textfield/native_textfield_win.cc

+++ b/views/controls/textfield/native_textfield_win.cc

@@ -14,17 +14,19 @@

#include "skia/ext/skia_utils_win.h"

#include "ui/base/clipboard/clipboard.h"

#include "ui/base/clipboard/scoped_clipboard_writer.h"

-#include "ui/base/keycodes/keyboard_codes.h"

#include "ui/base/keycodes/keyboard_code_conversion_win.h"

+#include "ui/base/keycodes/keyboard_codes.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_win.h"

#include "ui/gfx/native_theme_win.h"

#include "views/controls/label.h"

-#include "views/controls/menu/menu_win.h"

#include "views/controls/menu/menu_2.h"

+#include "views/controls/menu/menu_win.h"

#include "views/controls/native/native_view_host.h"

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

+#include "views/controls/textfield/text_range.h"

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

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

#include "views/focus/focus_manager.h"

#include "views/focus/focus_util_win.h"

#include "views/metrics.h"

@@ -934,7 +936,7 @@ void NativeTextfieldWin::HandleKeystroke() {

const MSG* msg = GetCurrentMessage();

ScopedFreeze freeze(this, GetTextObjectModel());

- Textfield::Controller* controller = textfield_->GetController();

+ TextfieldController* controller = textfield_->GetController();

bool handled = false;

if (controller) {

KeyEvent event(*msg);