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

Side by Side Diff: ui/wm/core/wm_state.cc

Issue 2466023003: Makes CaptureController be created and owned by WMState (Closed)
Patch Set: moar Created 4 years, 1 month 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 | « ui/wm/core/wm_state.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/wm/core/wm_state.h" 5 #include "ui/wm/core/wm_state.h"
6 6
7 #include "ui/events/platform/platform_event_source.h" 7 #include "ui/events/platform/platform_event_source.h"
8 #include "ui/wm/core/capture_controller.h"
8 #include "ui/wm/core/transient_window_controller.h" 9 #include "ui/wm/core/transient_window_controller.h"
9 #include "ui/wm/core/transient_window_stacking_client.h" 10 #include "ui/wm/core/transient_window_stacking_client.h"
10 11
11 namespace wm { 12 namespace wm {
12 13
13 WMState::WMState() 14 WMState::WMState()
14 : window_stacking_client_(new TransientWindowStackingClient), 15 : window_stacking_client_(new TransientWindowStackingClient),
15 transient_window_client_(new TransientWindowController) { 16 transient_window_client_(new TransientWindowController),
17 capture_controller_(base::MakeUnique<CaptureController>()) {
16 aura::client::SetWindowStackingClient(window_stacking_client_.get()); 18 aura::client::SetWindowStackingClient(window_stacking_client_.get());
17 aura::client::SetTransientWindowClient(transient_window_client_.get()); 19 aura::client::SetTransientWindowClient(transient_window_client_.get());
18 } 20 }
19 21
20 WMState::~WMState() { 22 WMState::~WMState() {
21 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get()) 23 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get())
22 aura::client::SetWindowStackingClient(NULL); 24 aura::client::SetWindowStackingClient(NULL);
23 25
24 if (aura::client::GetTransientWindowClient() == 26 if (aura::client::GetTransientWindowClient() ==
25 transient_window_client_.get()) { 27 transient_window_client_.get()) {
26 aura::client::SetTransientWindowClient(NULL); 28 aura::client::SetTransientWindowClient(NULL);
27 } 29 }
28 } 30 }
29 31
30 } // namespace wm 32 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/wm_state.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698