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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == | 68 views::MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) == |
69 views::MenuRunner::MENU_DELETED) | 69 views::MenuRunner::MENU_DELETED) |
70 return; | 70 return; |
71 #endif // !defined(OS_MACOSX) | 71 #endif // !defined(OS_MACOSX) |
72 } | 72 } |
73 | 73 |
74 void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) { | 74 void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) { |
75 workspace_manager_->SetWorkspaceSize(new_size); | 75 workspace_manager_->SetWorkspaceSize(new_size); |
76 } | 76 } |
77 | 77 |
78 void WorkspaceController::OnScreenWorkAreaInsetsChanged() { | |
79 workspace_manager_->SetWorkspaceBounds(); | |
sky
2012/03/01 01:43:19
Shouldn't this be the same as OnRootWindowResized?
jennyz
2012/03/01 18:27:45
OnScreenWorkAreaInsetsChanged() does not pass the
sky
2012/03/01 18:43:45
I see what you're saying. In that case name the Wo
jennyz
2012/03/01 19:13:12
Done.
| |
80 } | |
81 | |
78 void WorkspaceController::OnWindowPropertyChanged(aura::Window* window, | 82 void WorkspaceController::OnWindowPropertyChanged(aura::Window* window, |
79 const void* key, | 83 const void* key, |
80 intptr_t old) { | 84 intptr_t old) { |
81 if (key == aura::client::kRootWindowActiveWindowKey) | 85 if (key == aura::client::kRootWindowActiveWindowKey) |
82 workspace_manager_->SetActiveWorkspaceByWindow(wm::GetActiveWindow()); | 86 workspace_manager_->SetActiveWorkspaceByWindow(wm::GetActiveWindow()); |
83 } | 87 } |
84 | 88 |
85 bool WorkspaceController::IsCommandIdChecked(int command_id) const { | 89 bool WorkspaceController::IsCommandIdChecked(int command_id) const { |
86 switch (static_cast<MenuItem>(command_id)) { | 90 switch (static_cast<MenuItem>(command_id)) { |
87 case MENU_SNAP_TO_GRID: | 91 case MENU_SNAP_TO_GRID: |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
134 } | 138 } |
135 | 139 |
136 bool WorkspaceController::GetAcceleratorForCommandId( | 140 bool WorkspaceController::GetAcceleratorForCommandId( |
137 int command_id, | 141 int command_id, |
138 ui::Accelerator* accelerator) { | 142 ui::Accelerator* accelerator) { |
139 return false; | 143 return false; |
140 } | 144 } |
141 | 145 |
142 } // namespace internal | 146 } // namespace internal |
143 } // namespace ash | 147 } // namespace ash |
OLD | NEW |