ui/views/animation/ink_drop_host_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: ui/views/animation/ink_drop_host_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: ui/views/animation/ink_drop_host_view.cc

diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc

index 4f5f953b410751f9351b0b111a533df5b2099675..e1f48a875efe74b811d6126ab90f1bf63b6a55e5 100644

--- a/ui/views/animation/ink_drop_host_view.cc

+++ b/ui/views/animation/ink_drop_host_view.cc

@@ -9,8 +9,8 @@

#include "ui/gfx/color_palette.h"

#include "ui/gfx/geometry/size_conversions.h"

#include "ui/views/animation/ink_drop.h"

-#include "ui/views/animation/ink_drop_factory.h"

#include "ui/views/animation/ink_drop_highlight.h"

+#include "ui/views/animation/ink_drop_impl.h"

#include "ui/views/animation/ink_drop_stub.h"

#include "ui/views/animation/square_ink_drop_ripple.h"

@@ -192,7 +192,7 @@ bool InkDropHostView::ShouldShowInkDropForFocus() const {

void InkDropHostView::SetHasInkDrop(bool has_an_ink_drop) {

if (has_an_ink_drop) {

- ink_drop_ = InkDropFactory::CreateInkDrop(this);

+ ink_drop_.reset(new InkDropImpl(this));

gesture_handler_.reset(new InkDropGestureHandler(this, ink_drop_.get()));

} else {

gesture_handler_.reset();

« no previous file with comments | « ui/views/animation/ink_drop_factory_unittest.cc ('k') | ui/views/animation/ink_drop_stub.h » ('j') | no next file with comments »