Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: ash/wm/workspace_controller.cc

Issue 2234033002: mash: Remove WorkspaceLayoutManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove WmRootWindowControllerObserver::OnFullscreenStateChanged; use ShellObserver. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/shell_window_ids.h" 10 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/wm/window_state.h" 11 #include "ash/common/wm/window_state.h"
12 #include "ash/common/wm/workspace/workspace_layout_manager.h" 12 #include "ash/common/wm/workspace/workspace_layout_manager.h"
13 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" 13 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
14 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
15 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
16 #include "ash/shelf/shelf_layout_manager.h" 15 #include "ash/shelf/shelf_layout_manager.h"
17 #include "ash/shell.h" 16 #include "ash/shell.h"
18 #include "ash/wm/window_animations.h" 17 #include "ash/wm/window_animations.h"
19 #include "ash/wm/window_state_aura.h" 18 #include "ash/wm/window_state_aura.h"
20 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
21 #include "ash/wm/workspace/workspace_event_handler.h" 20 #include "ash/wm/workspace/workspace_event_handler.h"
22 #include "base/memory/ptr_util.h" 21 #include "base/memory/ptr_util.h"
23 #include "ui/aura/client/aura_constants.h" 22 #include "ui/aura/client/aura_constants.h"
24 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
(...skipping 12 matching lines...) Expand all
37 const int kInitialPauseTimeMS = 750; 36 const int kInitialPauseTimeMS = 750;
38 37
39 // Returns true if there are visible docked windows in the same screen as the 38 // Returns true if there are visible docked windows in the same screen as the
40 // |shelf|. 39 // |shelf|.
41 bool IsDockedAreaVisible(const ShelfLayoutManager* shelf) { 40 bool IsDockedAreaVisible(const ShelfLayoutManager* shelf) {
42 return shelf->dock_bounds().width() > 0; 41 return shelf->dock_bounds().width() > 0;
43 } 42 }
44 43
45 } // namespace 44 } // namespace
46 45
47 WorkspaceController::WorkspaceController( 46 WorkspaceController::WorkspaceController(aura::Window* viewport)
48 aura::Window* viewport,
49 std::unique_ptr<wm::WorkspaceLayoutManagerDelegate> delegate)
50 : viewport_(viewport), 47 : viewport_(viewport),
51 shelf_(NULL), 48 shelf_(NULL),
52 event_handler_(new WorkspaceEventHandler), 49 event_handler_(new WorkspaceEventHandler),
53 layout_manager_(new WorkspaceLayoutManager(WmWindowAura::Get(viewport), 50 layout_manager_(new WorkspaceLayoutManager(WmWindowAura::Get(viewport))) {
54 std::move(delegate))) {
55 SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE); 51 SetWindowVisibilityAnimationTransition(viewport_, ::wm::ANIMATE_NONE);
56 52
57 WmWindowAura::Get(viewport_)->SetLayoutManager( 53 WmWindowAura::Get(viewport_)->SetLayoutManager(
58 base::WrapUnique(layout_manager_)); 54 base::WrapUnique(layout_manager_));
59 viewport_->AddPreTargetHandler(event_handler_.get()); 55 viewport_->AddPreTargetHandler(event_handler_.get());
60 } 56 }
61 57
62 WorkspaceController::~WorkspaceController() { 58 WorkspaceController::~WorkspaceController() {
63 viewport_->SetLayoutManager(NULL); 59 viewport_->SetLayoutManager(NULL);
64 viewport_->RemovePreTargetHandler(event_handler_.get()); 60 viewport_->RemovePreTargetHandler(event_handler_.get());
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 viewport_->layer()->SetOpacity(1.0f); 137 viewport_->layer()->SetOpacity(1.0f);
142 } 138 }
143 } 139 }
144 140
145 void WorkspaceController::SetMaximizeBackdropDelegate( 141 void WorkspaceController::SetMaximizeBackdropDelegate(
146 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) { 142 std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
147 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); 143 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate));
148 } 144 }
149 145
150 } // namespace ash 146 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698