diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 19:51:17 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 19:51:17 +0000 |
| commit | 5e664039f8213eeadd8d3fedae5fba082c1c4745 (patch) | |
| tree | d9b82093d88869e8e91943114726764429dee3b6 /ash/wm/workspace_controller.h | |
| parent | 0ef09d11bbf1670adf30c9934b83e12d482eab56 (diff) | |
| download | chromium_src-5e664039f8213eeadd8d3fedae5fba082c1c4745.zip chromium_src-5e664039f8213eeadd8d3fedae5fba082c1c4745.tar.gz chromium_src-5e664039f8213eeadd8d3fedae5fba082c1c4745.tar.bz2 | |
Fix compile with Aura/Mac ash_shell and workspace controller
Fixes link issues on Mac/AuraShell.app with WorkspaceController.
implemented.
BUG=None
TEST=Compile on Mac/Aura.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9159048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller.h')
| -rw-r--r-- | ash/wm/workspace_controller.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index b582898..d79680b 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); }; |