Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side 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, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/wm/workspace_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_ 5 #ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
6 #define ASH_WM_WORKSPACE_CONTROLLER_H_ 6 #define ASH_WM_WORKSPACE_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 aura::Window* viewport_; 80 aura::Window* viewport_;
81 81
82 scoped_ptr<WorkspaceManager> workspace_manager_; 82 scoped_ptr<WorkspaceManager> workspace_manager_;
83 83
84 // Owned by the window its attached to. 84 // Owned by the window its attached to.
85 WorkspaceLayoutManager* layout_manager_; 85 WorkspaceLayoutManager* layout_manager_;
86 86
87 // Owned the window set on. 87 // Owned the window set on.
88 WorkspaceEventFilter* event_filter_; 88 WorkspaceEventFilter* event_filter_;
89 89
90 #if !defined(OS_MACOSX)
90 scoped_ptr<views::MenuRunner> menu_runner_; 91 scoped_ptr<views::MenuRunner> menu_runner_;
92 #endif
91 93
92 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); 94 DISALLOW_COPY_AND_ASSIGN(WorkspaceController);
93 }; 95 };
94 96
95 } // namespace internal 97 } // namespace internal
96 } // namespace ash 98 } // namespace ash
97 99
98 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ 100 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/workspace_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698