Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5096)

Unified Diff: chrome/browser/ui/views/toolbar/wrench_menu.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/toolbar/toolbar_view.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/wrench_menu.cc
diff --git a/chrome/browser/ui/views/toolbar/wrench_menu.cc b/chrome/browser/ui/views/toolbar/wrench_menu.cc
index cb85839e209c1a78de8c41c4a3dfb9449dc1c047..a4ce9f54131065945785ea5d49554b64a62a04d9 100644
--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc
+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc
@@ -404,8 +404,8 @@ class WrenchMenuView : public views::View,
button->SetTextColor(views::Button::STATE_NORMAL, menu_config.text_color);
if (background)
*background = bg;
- button->set_border(
- new MenuButtonBorder(menu_config, menu_->use_new_menu()));
+ button->SetBorder(scoped_ptr<views::Border>(
+ new MenuButtonBorder(menu_config, menu_->use_new_menu())));
button->SetHorizontalAlignment(gfx::ALIGN_CENTER);
button->SetFontList(menu_config.font_list);
ui::NativeTheme* native_theme = button->GetNativeTheme();
@@ -626,8 +626,8 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
menu->use_new_menu());
zoom_label_->set_background(center_bg);
const MenuConfig& menu_config(menu->GetMenuConfig());
- zoom_label_->set_border(
- new MenuButtonBorder(menu_config, menu->use_new_menu()));
+ zoom_label_->SetBorder(scoped_ptr<views::Border>(
+ new MenuButtonBorder(menu_config, menu->use_new_menu())));
zoom_label_->SetFontList(menu_config.font_list);
AddChildView(zoom_label_);
@@ -677,7 +677,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView {
ImageButton::ALIGN_CENTER, ImageButton::ALIGN_MIDDLE);
int horizontal_padding =
menu->use_new_menu() ? kHorizontalTouchPadding : kHorizontalPadding;
- fullscreen_button_->set_border(views::Border::CreateEmptyBorder(
+ fullscreen_button_->SetBorder(views::Border::CreateEmptyBorder(
0, horizontal_padding, 0, horizontal_padding));
fullscreen_button_->set_background(
new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON,
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.cc ('k') | ui/app_list/views/apps_grid_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698