chrome/browser/ui/views/avatar_label.cc - Issue 145033006: views: Make View::set_border() take a scoped_ptr<>.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/avatar_label.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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/autofill/password_generation_popup_view_views.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/avatar_label.h"	5 #include "chrome/browser/ui/views/avatar_label.h"

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "chrome/browser/themes/theme_properties.h"	8 #include "chrome/browser/themes/theme_properties.h"

9 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"	9 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"

10 #include "chrome/browser/ui/views/frame/browser_view.h"	10 #include "chrome/browser/ui/views/frame/browser_view.h"

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118 SkColor color_label = browser_view_->frame()->GetThemeProvider()->GetColor(	118 SkColor color_label = browser_view_->frame()->GetThemeProvider()->GetColor(

119 ThemeProperties::COLOR_MANAGED_USER_LABEL);	119 ThemeProperties::COLOR_MANAGED_USER_LABEL);

120 SetEnabledColor(color_label);	120 SetEnabledColor(color_label);

121 SetHighlightColor(color_label);	121 SetHighlightColor(color_label);

122 SetHoverColor(color_label);	122 SetHoverColor(color_label);

123 SetDisabledColor(color_label);	123 SetDisabledColor(color_label);

124 SchedulePaint();	124 SchedulePaint();

125 }	125 }

126	126

127 void AvatarLabel::SetLabelOnRight(bool label_on_right) {	127 void AvatarLabel::SetLabelOnRight(bool label_on_right) {

128 set_border(new AvatarLabelBorder(label_on_right));	128 SetBorder(scoped_ptr<views::Border>(new AvatarLabelBorder(label_on_right)));

129 }	129 }

OLD	NEW