chrome/browser/ui/views/location_bar/location_bar_view.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: chrome/browser/ui/views/location_bar/location_bar_view.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | chrome/browser/ui/views/message_center/message_center_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc

index 326d0251ff48e27b798224fe6d0c95b87485f000..a741785fa4ad213ee8a119b0ecd8665ad237a71d 100644

--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc

+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -235,7 +235,7 @@ LocationBarView::~LocationBarView() {

void LocationBarView::InitTouchableLocationBarChildView(views::View* view) {

int horizontal_padding = GetBuiltInHorizontalPaddingForChildViews();

if (horizontal_padding != 0) {

- view->set_border(views::Border::CreateEmptyBorder(

+ view->SetBorder(views::Border::CreateEmptyBorder(

3, horizontal_padding, 3, horizontal_padding));

}

@@ -382,8 +382,8 @@ void LocationBarView::Init() {

search_button_->SetStyle(views::Button::STYLE_BUTTON);

search_button_->SetFocusable(false);

search_button_->set_min_size(gfx::Size());

- views::LabelButtonBorder* search_button_border =

- new views::LabelButtonBorder(search_button_->style());

+ scoped_ptr<views::LabelButtonBorder> search_button_border(

+ new views::LabelButtonBorder(search_button_->style()));

search_button_border->set_insets(gfx::Insets());

const int kSearchButtonNormalImages[] = IMAGE_GRID(IDR_OMNIBOX_SEARCH_BUTTON);

search_button_border->SetPainter(

@@ -404,7 +404,7 @@ void LocationBarView::Init() {

search_button_border->SetPainter(true, views::Button::STATE_HOVERED, NULL);

search_button_border->SetPainter(true, views::Button::STATE_PRESSED, NULL);

search_button_border->SetPainter(true, views::Button::STATE_DISABLED, NULL);

- search_button_->set_border(search_button_border);

+ search_button_->SetBorder(search_button_border.PassAs<views::Border>());

const int kSearchButtonWidth = 56;

search_button_->set_min_size(gfx::Size(kSearchButtonWidth, 0));

search_button_->SetVisible(false);

@@ -892,7 +892,7 @@ void LocationBarView::Layout() {

}

const gfx::Insets insets = omnibox_view_->GetInsets();

- omnibox_view_->set_border(views::Border::CreateEmptyBorder(

+ omnibox_view_->SetBorder(views::Border::CreateEmptyBorder(

insets.top(), insets.left(), insets.bottom(), omnibox_view_margin));

// Layout |ime_inline_autocomplete_view_| next to the user input.