| OLD | NEW |
|---|
| 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 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 WorkspaceLayoutManager* layout_manager() { return layout_manager_; } | 51 WorkspaceLayoutManager* layout_manager() { return layout_manager_; } |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 friend class WorkspaceControllerTestHelper; | 54 friend class WorkspaceControllerTestHelper; |
| 55 | 55 |
| 56 aura::Window* viewport_; | 56 aura::Window* viewport_; |
| 57 | 57 |
| 58 ShelfLayoutManager* shelf_; | 58 ShelfLayoutManager* shelf_; |
| 59 std::unique_ptr<WorkspaceEventHandler> event_handler_; | 59 std::unique_ptr<WorkspaceEventHandler> event_handler_; |
| 60 |
| 61 // Owned by |viewport_|. |
| 60 WorkspaceLayoutManager* layout_manager_; | 62 WorkspaceLayoutManager* layout_manager_; |
| 61 | 63 |
| 62 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 64 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 } // namespace ash | 67 } // namespace ash |
| 66 | 68 |
| 67 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 69 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1923983003:
Makes WorkspaceLayoutManager use ash/wm/common types (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master