| 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" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == | 66 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == |
| 67 views::MenuRunner::MENU_DELETED) | 67 views::MenuRunner::MENU_DELETED) |
| 68 return; | 68 return; |
| 69 #endif // !defined(OS_MACOSX) | 69 #endif // !defined(OS_MACOSX) |
| 70 } | 70 } |
| 71 | 71 |
| 72 void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) { | 72 void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) { |
| 73 workspace_manager_->SetWorkspaceSize(new_size); | 73 workspace_manager_->SetWorkspaceSize(new_size); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void WorkspaceController::OnScreenWorkAreaInsetsChanged() { |
| 77 workspace_manager_->OnScreenWorkAreaInsetsChanged(); |
| 78 } |
| 79 |
| 76 void WorkspaceController::OnWindowPropertyChanged(aura::Window* window, | 80 void WorkspaceController::OnWindowPropertyChanged(aura::Window* window, |
| 77 const void* key, | 81 const void* key, |
| 78 intptr_t old) { | 82 intptr_t old) { |
| 79 if (key == aura::client::kRootWindowActiveWindowKey) | 83 if (key == aura::client::kRootWindowActiveWindowKey) |
| 80 workspace_manager_->SetActiveWorkspaceByWindow(wm::GetActiveWindow()); | 84 workspace_manager_->SetActiveWorkspaceByWindow(wm::GetActiveWindow()); |
| 81 } | 85 } |
| 82 | 86 |
| 83 bool WorkspaceController::IsCommandIdChecked(int command_id) const { | 87 bool WorkspaceController::IsCommandIdChecked(int command_id) const { |
| 84 switch (static_cast<MenuItem>(command_id)) { | 88 switch (static_cast<MenuItem>(command_id)) { |
| 85 case MENU_SNAP_TO_GRID: | 89 case MENU_SNAP_TO_GRID: |
| (...skipping 30 matching lines...) Expand all Loading... |
| 116 } | 120 } |
| 117 | 121 |
| 118 bool WorkspaceController::GetAcceleratorForCommandId( | 122 bool WorkspaceController::GetAcceleratorForCommandId( |
| 119 int command_id, | 123 int command_id, |
| 120 ui::Accelerator* accelerator) { | 124 ui::Accelerator* accelerator) { |
| 121 return false; | 125 return false; |
| 122 } | 126 } |
| 123 | 127 |
| 124 } // namespace internal | 128 } // namespace internal |
| 125 } // namespace ash | 129 } // namespace ash |
| OLD | NEW |