chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 2067013002: Removed InkDropFactory.

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 2067013002: Removed InkDropFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed views:: -> ui:: compile error. 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:

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..bb15ae8a25e925c2379bfb2dc9faa68d44070012 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"

@@ -61,7 +62,7 @@ ToolbarActionView::ToolbarActionView(

wants_to_run_(false),

menu_(nullptr),

weak_factory_(this) {

- SetHasInkDrop(true);

+ SetHasInkDrop(ui::MaterialDesignController::IsModeMaterial());

set_has_ink_drop_action_on_click(true);

set_id(VIEW_ID_BROWSER_ACTION);

view_controller_->SetDelegate(this);