ui/views/controls/combobox/combobox.cc - Issue 145033006: views: Make View::set_border() take a scoped_ptr<>.

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/combobox/combobox.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT 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: ui/views/controls/combobox/combobox.cc

diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc

index 1f0b9fdbcc8a1b60270806c9594389401440181c..bfbafa5ca3ae05ddaeb9c28a707fe048738d30be 100644

--- a/ui/views/controls/combobox/combobox.cc

+++ b/ui/views/controls/combobox/combobox.cc

@@ -593,12 +593,12 @@ void Combobox::UpdateFromModel() {

}

void Combobox::UpdateBorder() {

- FocusableBorder* border = new FocusableBorder();

+ scoped_ptr<FocusableBorder> border(new FocusableBorder());

if (style_ == STYLE_NOTIFY_ON_CLICK)

border->SetInsets(8, 13, 8, 13);

if (invalid_)

border->SetColor(kWarningColor);

- set_border(border);

+ SetBorder(border.PassAs<Border>());

}

void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {

« no previous file with comments | « ui/views/controls/button/text_button.cc ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »