ash/shelf/shelf_view.h - Issue 2176813002: mash: Migrate ShelfTooltipManager to wm common types.

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: ash/shelf/shelf_view.h

Issue 2176813002: mash: Migrate ShelfTooltipManager to wm common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update comment. Created 4 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

Index: ash/shelf/shelf_view.h

diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h

index 0bbc33470c88040b827d5d3158aa884e1e42ed92..e97a5de749b6e2a615d0b0348e2600edeb357b7b 100644

--- a/ash/shelf/shelf_view.h

+++ b/ash/shelf/shelf_view.h

@@ -13,8 +13,8 @@

#include "ash/common/shelf/ink_drop_button_listener.h"

#include "ash/common/shelf/shelf_item_delegate.h"

#include "ash/common/shelf/shelf_model_observer.h"

+#include "ash/common/shelf/shelf_tooltip_manager.h"

#include "ash/shelf/shelf_button_pressed_metric_tracker.h"

-#include "ash/shelf/shelf_tooltip_manager.h"

#include "ash/wm/gestures/shelf_gesture_handler.h"

#include "base/macros.h"

#include "base/observer_list.h"

@@ -75,6 +75,7 @@ class ASH_EXPORT ShelfView : public views::View,

~ShelfView() override;

Shelf* shelf() const { return shelf_; }

+ WmShelf* wm_shelf() const { return wm_shelf_; }

ShelfModel* model() const { return model_; }

void Init();

« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »