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 #include "ash/wm/workspace_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/window_util.h" | 8 #include "ash/wm/window_util.h" |
9 #include "ash/wm/workspace/workspace_event_filter.h" | 9 #include "ash/wm/workspace/workspace_event_filter.h" |
10 #include "ash/wm/workspace/workspace_layout_manager.h" | 10 #include "ash/wm/workspace/workspace_layout_manager.h" |
11 #include "ash/wm/workspace/workspace_manager.h" | 11 #include "ash/wm/workspace/workspace_manager.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "ui/aura/client/activation_client.h" | 13 #include "ui/aura/client/activation_client.h" |
14 #include "ui/aura/client/aura_constants.h" | 14 #include "ui/aura/client/aura_constants.h" |
15 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/views/controls/menu/menu_model_adapter.h" | 17 #include "ui/views/controls/menu/menu_model_adapter.h" |
18 #include "ui/views/controls/menu/menu_runner.h" | 18 #include "ui/views/controls/menu/menu_runner.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace internal { | 21 namespace internal { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 // Size of the grid when a grid is enabled. | 25 // Size of the grid when a grid is enabled. |
26 const int kGridSize = 8; | 26 const int kGridSize = 16; |
27 | 27 |
28 } // namespace | 28 } // namespace |
29 | 29 |
30 WorkspaceController::WorkspaceController(aura::Window* viewport) | 30 WorkspaceController::WorkspaceController(aura::Window* viewport) |
31 : viewport_(viewport), | 31 : viewport_(viewport), |
32 workspace_manager_(new WorkspaceManager(viewport)), | 32 workspace_manager_(new WorkspaceManager(viewport)), |
33 layout_manager_(NULL), | 33 layout_manager_(NULL), |
34 event_filter_(NULL) { | 34 event_filter_(NULL) { |
35 event_filter_ = new WorkspaceEventFilter(viewport); | 35 event_filter_ = new WorkspaceEventFilter(viewport); |
36 viewport->SetEventFilter(event_filter_); | 36 viewport->SetEventFilter(event_filter_); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 } | 119 } |
120 | 120 |
121 bool WorkspaceController::GetAcceleratorForCommandId( | 121 bool WorkspaceController::GetAcceleratorForCommandId( |
122 int command_id, | 122 int command_id, |
123 ui::Accelerator* accelerator) { | 123 ui::Accelerator* accelerator) { |
124 return false; | 124 return false; |
125 } | 125 } |
126 | 126 |
127 } // namespace internal | 127 } // namespace internal |
128 } // namespace ash | 128 } // namespace ash |
OLD | NEW |