ui/views/controls/textfield/textfield_views_model.cc - Issue 11421204: Use native theme colors for textfields; etc.

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

Issue 11421204: Use native theme colors for textfields; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Nix cursor color; adjust textfield functions; add read-only theme colors. Created 8 years 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: ui/views/controls/textfield/textfield_views_model.cc

diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc

index c7799279293798f33e39aa5d5b005d4beb54fb36..8ed8ba00dac54ccb780ce281f4392efe7ae7ce91 100644

--- a/ui/views/controls/textfield/textfield_views_model.cc

+++ b/ui/views/controls/textfield/textfield_views_model.cc

@@ -18,7 +18,6 @@

#include "ui/gfx/font.h"

#include "ui/gfx/render_text.h"

#include "ui/gfx/text_constants.h"

-#include "ui/native_theme/native_theme.h"

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

namespace views {

@@ -284,16 +283,6 @@ TextfieldViewsModel::TextfieldViewsModel(Delegate* delegate)

: delegate_(delegate),

render_text_(gfx::RenderText::CreateInstance()),

current_edit_(edit_history_.end()) {

- const ui::NativeTheme* theme = ui::NativeTheme::instance();

- render_text_->set_selection_color(

- theme->GetSystemColor(

- ui::NativeTheme::kColorId_TextfieldSelectionColor));

- render_text_->set_selection_background_focused_color(

- theme->GetSystemColor(

- ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));

- render_text_->set_selection_background_unfocused_color(

- theme->GetSystemColor(

- ui::NativeTheme::kColorId_TextfieldSelectionBackgroundUnfocused));

}

TextfieldViewsModel::~TextfieldViewsModel() {