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

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

Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique. (Closed)
Patch Set: restore order of includes in x11_topmost_window_finder_interactive_uitest.cc Created 3 years, 12 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 | « ui/views/widget/native_widget_aura_interactive_uitest.cc ('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 "base/memory/ptr_util.h"
7 #include "ui/events/platform/platform_event_source.h" 8 #include "ui/events/platform/platform_event_source.h"
8 #include "ui/wm/core/capture_controller.h" 9 #include "ui/wm/core/capture_controller.h"
9 #include "ui/wm/core/transient_window_controller.h" 10 #include "ui/wm/core/transient_window_controller.h"
10 #include "ui/wm/core/transient_window_stacking_client.h" 11 #include "ui/wm/core/transient_window_stacking_client.h"
11 12
12 namespace wm { 13 namespace wm {
13 14
14 WMState::WMState() 15 WMState::WMState()
15 : window_stacking_client_(new TransientWindowStackingClient), 16 : window_stacking_client_(new TransientWindowStackingClient),
16 transient_window_client_(new TransientWindowController), 17 transient_window_client_(new TransientWindowController),
17 capture_controller_(base::MakeUnique<CaptureController>()) { 18 capture_controller_(base::MakeUnique<CaptureController>()) {
18 aura::client::SetWindowStackingClient(window_stacking_client_.get()); 19 aura::client::SetWindowStackingClient(window_stacking_client_.get());
19 aura::client::SetTransientWindowClient(transient_window_client_.get()); 20 aura::client::SetTransientWindowClient(transient_window_client_.get());
20 } 21 }
21 22
22 WMState::~WMState() { 23 WMState::~WMState() {
23 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get()) 24 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get())
24 aura::client::SetWindowStackingClient(NULL); 25 aura::client::SetWindowStackingClient(NULL);
25 26
26 if (aura::client::GetTransientWindowClient() == 27 if (aura::client::GetTransientWindowClient() ==
27 transient_window_client_.get()) { 28 transient_window_client_.get()) {
28 aura::client::SetTransientWindowClient(NULL); 29 aura::client::SetTransientWindowClient(NULL);
29 } 30 }
30 } 31 }
31 32
32 } // namespace wm 33 } // namespace wm
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698