ash/wm/workspace_controller.h - Issue 9159048: Fix compile with Aura/Mac ash_shell and workspace controller

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/wm/workspace_controller.h

Issue 9159048: Fix compile with Aura/Mac ash_shell and workspace controller (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes reverse iterators for compatibility with 10.5 SDK Created 8 years, 11 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: ash/wm/workspace_controller.h

diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h

index b582898f0c2f6e564a39085a5fbc06072046f12d..d79680b3f8383604603dfbeae0017949a6c98a4c 100644

--- a/ash/wm/workspace_controller.h

+++ b/ash/wm/workspace_controller.h

@@ -87,7 +87,9 @@ class ASH_EXPORT WorkspaceController :

// Owned the window set on.

WorkspaceEventFilter* event_filter_;

+#if !defined(OS_MACOSX)

scoped_ptr<views::MenuRunner> menu_runner_;

+#endif

DISALLOW_COPY_AND_ASSIGN(WorkspaceController);

};

« no previous file with comments | « no previous file | ash/wm/workspace_controller.cc » ('j') | no next file with comments »