chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 2069733002: MD - Use real comboboxes in website settings popup. Hide borders (but

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

Issue 2069733002: MD - Use real comboboxes in website settings popup. Hide borders (but (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix test Created 4 years, 6 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/app_menu_button.cc ('k') | chrome/browser/ui/views/website_settings/permission_selector_view.cc » ('j') | ui/views/controls/combobox/combobox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

index 50d6d27680a68c8f00d1b71a153d1ebe3af5a134..b25ea00fde024fa1568e495071184d3d9a8247d8 100644

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

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

@@ -18,6 +18,7 @@

#include "content/public/browser/notification_source.h"

#include "grit/theme_resources.h"

#include "ui/accessibility/ax_view_state.h"

+#include "ui/base/material_design/material_design_controller.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/theme_provider.h"

#include "ui/compositor/paint_recorder.h"

@@ -62,6 +63,8 @@ ToolbarActionView::ToolbarActionView(

menu_(nullptr),

weak_factory_(this) {

SetHasInkDrop(true);

+ if (ui::MaterialDesignController::IsModeMaterial())

msw 2016/06/15 19:52:38 nit: order after set_has_ink_drop_action_on_click,

+ SetFocusPainter(nullptr);

set_has_ink_drop_action_on_click(true);

set_id(VIEW_ID_BROWSER_ACTION);

view_controller_->SetDelegate(this);