chrome/browser/ui/views/toolbar/wrench_menu.cc - Issue 1228213003: Just set borders once when creating a views::LabelButton

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/toolbar/wrench_menu.cc

Issue 1228213003: Just set borders once when creating a views::LabelButton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix BookmarkBarViewTest and GlobalErrorServiceBrowserTest Created 5 years, 5 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

« chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc ('K') | « chrome/browser/ui/views/global_error_bubble_view.cc ('k') | chrome/browser/ui/views/website_settings/permission_selector_view.cc » ('j') | ui/views/controls/button/blue_button_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 00d9a7abe8cc115eda6fb335dabd5dc134df0b08..c2e2985776833bd48f35b0379ec367bf1e4ef9cc 100644

--- a/chrome/browser/ui/views/toolbar/wrench_menu.cc

+++ b/chrome/browser/ui/views/toolbar/wrench_menu.cc

@@ -268,8 +268,8 @@ class InMenuButton : public LabelButton {

in_menu_background_ = new InMenuButtonBackground(type);

set_background(in_menu_background_);

- OnNativeThemeChanged(NULL);

+ SetBorder(views::Border::CreateEmptyBorder(0, kHorizontalPadding, 0,

+ kHorizontalPadding));

}

void SetOtherButtons(const InMenuButton* left, const InMenuButton* right) {

@@ -279,8 +279,6 @@ class InMenuButton : public LabelButton {

// views::LabelButton

void OnNativeThemeChanged(const ui::NativeTheme* theme) override {

const MenuConfig& menu_config = MenuConfig::instance(theme);

- SetBorder(views::Border::CreateEmptyBorder(

- 0, kHorizontalPadding, 0, kHorizontalPadding));

SetFontList(menu_config.font_list);

if (theme) {