chrome/browser/ui/views/toolbar/app_menu_button.h - Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

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/app_menu_button.h

Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Collapsed 'if' conditionals in to a single 'if' in ToolbarButton::OnMousePressed(). Created 5 years 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/bar_control_button.cc ('K') | « chrome/browser/ui/views/bar_control_button.cc ('k') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/app_menu_button.h

diff --git a/chrome/browser/ui/views/toolbar/app_menu_button.h b/chrome/browser/ui/views/toolbar/app_menu_button.h

index 2536f543d92fb919f799695ecad511d54f2bbfa3..7ace6ac2f3cfb7e9425507d521c92a737109a919 100644

--- a/chrome/browser/ui/views/toolbar/app_menu_button.h

+++ b/chrome/browser/ui/views/toolbar/app_menu_button.h

@@ -18,7 +18,6 @@ class AppMenu;

class AppMenuModel;

namespace views {

-class InkDropAnimationController;

class LabelButtonBorder;

class MenuListener;

}

@@ -85,7 +84,6 @@ class AppMenuButton : public views::InkDropHost,

std::set<ui::Clipboard::FormatType>* format_types) override;

bool AreDropTypesRequired() override;

bool CanDrop(const ui::OSExchangeData& data) override;

- void Layout() override;

void OnDragEntered(const ui::DropTargetEvent& event) override;

int OnDragUpdated(const ui::DropTargetEvent& event) override;

void OnDragExited() override;

@@ -98,9 +96,6 @@ class AppMenuButton : public views::InkDropHost,

// Only used in MD.

AppMenuIconPainter::Severity severity_;

- // Animation controller for the ink drop ripple effect.

- scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;

// Our owning toolbar view.

ToolbarView* toolbar_view_;