| 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 #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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; | 67 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; |
| 68 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; | 68 virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; |
| 69 virtual void ExecuteCommand(int command_id) OVERRIDE; | 69 virtual void ExecuteCommand(int command_id) OVERRIDE; |
| 70 virtual bool GetAcceleratorForCommandId( | 70 virtual bool GetAcceleratorForCommandId( |
| 71 int command_id, | 71 int command_id, |
| 72 ui::Accelerator* accelerator) OVERRIDE; | 72 ui::Accelerator* accelerator) OVERRIDE; |
| 73 | 73 |
| 74 private: | 74 private: |
| 75 enum MenuItem { | 75 enum MenuItem { |
| 76 MENU_SNAP_TO_GRID, | 76 MENU_SNAP_TO_GRID, |
| 77 MENU_OPEN_MAXIMIZED, | |
| 78 }; | 77 }; |
| 79 | 78 |
| 80 aura::Window* viewport_; | 79 aura::Window* viewport_; |
| 81 | 80 |
| 82 scoped_ptr<WorkspaceManager> workspace_manager_; | 81 scoped_ptr<WorkspaceManager> workspace_manager_; |
| 83 | 82 |
| 84 // Owned by the window its attached to. | 83 // Owned by the window its attached to. |
| 85 WorkspaceLayoutManager* layout_manager_; | 84 WorkspaceLayoutManager* layout_manager_; |
| 86 | 85 |
| 87 // Owned by |viewport_|. | 86 // Owned by |viewport_|. |
| 88 WorkspaceEventFilter* event_filter_; | 87 WorkspaceEventFilter* event_filter_; |
| 89 | 88 |
| 90 #if !defined(OS_MACOSX) | 89 #if !defined(OS_MACOSX) |
| 91 scoped_ptr<views::MenuRunner> menu_runner_; | 90 scoped_ptr<views::MenuRunner> menu_runner_; |
| 92 #endif | 91 #endif |
| 93 | 92 |
| 94 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); | 93 DISALLOW_COPY_AND_ASSIGN(WorkspaceController); |
| 95 }; | 94 }; |
| 96 | 95 |
| 97 } // namespace internal | 96 } // namespace internal |
| 98 } // namespace ash | 97 } // namespace ash |
| 99 | 98 |
| 100 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ | 99 #endif // ASH_WM_WORKSPACE_CONTROLLER_H_ |
| OLD | NEW |