ash/common/shelf/shelf_button.cc - Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access

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/common/shelf/shelf_button.cc

Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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/common/shelf/shelf_button.cc

diff --git a/ash/common/shelf/shelf_button.cc b/ash/common/shelf/shelf_button.cc

index 8e31e850638a89c110231439ad9f862b2972358c..74fccef59ed76b941c0341a4ad52706f84a0da99 100644

--- a/ash/common/shelf/shelf_button.cc

+++ b/ash/common/shelf/shelf_button.cc

@@ -10,9 +10,9 @@

#include "ash/common/material_design/material_design_controller.h"

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

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

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

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

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

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

#include "base/time/time.h"

#include "grit/ash_resources.h"

#include "skia/ext/image_operations.h"

« no previous file with comments | « ash/common/shelf/overflow_bubble.cc ('k') | ash/common/shelf/shelf_icon_observer.h » ('j') | no next file with comments »