ash/shelf/shelf_widget.h - Issue 2243513004: mash: Partially migrate WorkspaceController to ash common.

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_widget.h

Issue 2243513004: mash: Partially migrate WorkspaceController to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test failures and crashes. 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/shelf/shelf_widget.h

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

index ebf3e021bb4c4b16d8cf6a3a7b1757afc7c1a7f0..9efbd633c9394062c76573bc6029d28cc8b91acf 100644

--- a/ash/shelf/shelf_widget.h

+++ b/ash/shelf/shelf_widget.h

@@ -23,7 +23,6 @@ class ShelfLayoutManager;

class StatusAreaWidget;

class WmShelfAura;

class WmWindow;

-class WorkspaceController;

class ASH_EXPORT ShelfWidget : public views::Widget,

public views::WidgetObserver,

@@ -32,8 +31,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,

public:

ShelfWidget(WmWindow* shelf_container,

WmWindow* status_container,

- WmShelfAura* wm_shelf_aura,

- WorkspaceController* workspace_controller);

+ WmShelfAura* wm_shelf_aura);

James Cook 2016/08/11 23:27:35 so nice to have fewer dependencies

msw 2016/08/12 00:17:15 Acknowledged.

~ShelfWidget() override;

// Returns if shelf alignment option is enabled, and the user is able to

« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | ash/wm/workspace_controller.cc » ('J')