| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 } | 38 } |
| 39 | 39 |
| 40 } // namespace | 40 } // namespace |
| 41 | 41 |
| 42 WorkspaceController::WorkspaceController(aura::Window* viewport) | 42 WorkspaceController::WorkspaceController(aura::Window* viewport) |
| 43 : viewport_(viewport), | 43 : viewport_(viewport), |
| 44 shelf_(NULL), | 44 shelf_(NULL), |
| 45 event_handler_(new WorkspaceEventHandler), | 45 event_handler_(new WorkspaceEventHandler), |
| 46 layout_manager_(new WorkspaceLayoutManager(viewport)) { | 46 layout_manager_(new WorkspaceLayoutManager(viewport)) { |
| 47 SetWindowVisibilityAnimationTransition( | 47 SetWindowVisibilityAnimationTransition( |
| 48 viewport_, views::corewm::ANIMATE_NONE); | 48 viewport_, ::wm::ANIMATE_NONE); |
| 49 | 49 |
| 50 viewport_->SetLayoutManager(layout_manager_); | 50 viewport_->SetLayoutManager(layout_manager_); |
| 51 viewport_->AddPreTargetHandler(event_handler_.get()); | 51 viewport_->AddPreTargetHandler(event_handler_.get()); |
| 52 viewport_->AddPostTargetHandler(event_handler_.get()); | 52 viewport_->AddPostTargetHandler(event_handler_.get()); |
| 53 } | 53 } |
| 54 | 54 |
| 55 WorkspaceController::~WorkspaceController() { | 55 WorkspaceController::~WorkspaceController() { |
| 56 viewport_->SetLayoutManager(NULL); | 56 viewport_->SetLayoutManager(NULL); |
| 57 viewport_->RemovePreTargetHandler(event_handler_.get()); | 57 viewport_->RemovePreTargetHandler(event_handler_.get()); |
| 58 viewport_->RemovePostTargetHandler(event_handler_.get()); | 58 viewport_->RemovePostTargetHandler(event_handler_.get()); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 | 138 |
| 139 void WorkspaceController::SetMaximizeBackdropDelegate( | 139 void WorkspaceController::SetMaximizeBackdropDelegate( |
| 140 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { | 140 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { |
| 141 layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); | 141 layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); |
| 142 } | 142 } |
| 143 | 143 |
| 144 } // namespace internal | 144 } // namespace internal |
| 145 } // namespace ash | 145 } // namespace ash |
| OLD | NEW |