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

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

Issue 219743002: x11: Move X event handling out of the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r261267 Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/wm/core/wm_state.h ('k') | ui/wm/test/wm_test_helper.h » ('j') | 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/wm/core/transient_window_controller.h" 8 #include "ui/wm/core/transient_window_controller.h"
8 #include "ui/wm/core/transient_window_stacking_client.h" 9 #include "ui/wm/core/transient_window_stacking_client.h"
9 10
10 namespace wm { 11 namespace wm {
11 12
12 WMState::WMState() 13 WMState::WMState()
13 : window_stacking_client_(new TransientWindowStackingClient), 14 : window_stacking_client_(new TransientWindowStackingClient),
14 transient_window_client_(new TransientWindowController) { 15 transient_window_client_(new TransientWindowController) {
15 aura::client::SetWindowStackingClient(window_stacking_client_.get()); 16 aura::client::SetWindowStackingClient(window_stacking_client_.get());
16 aura::client::SetTransientWindowClient(transient_window_client_.get()); 17 aura::client::SetTransientWindowClient(transient_window_client_.get());
18 if (!ui::PlatformEventSource::GetInstance())
19 event_source_ = ui::PlatformEventSource::CreateDefault();
17 } 20 }
18 21
19 WMState::~WMState() { 22 WMState::~WMState() {
20 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get()) 23 if (aura::client::GetWindowStackingClient() == window_stacking_client_.get())
21 aura::client::SetWindowStackingClient(NULL); 24 aura::client::SetWindowStackingClient(NULL);
22 25
23 if (aura::client::GetTransientWindowClient() == 26 if (aura::client::GetTransientWindowClient() ==
24 transient_window_client_.get()) { 27 transient_window_client_.get()) {
25 aura::client::SetTransientWindowClient(NULL); 28 aura::client::SetTransientWindowClient(NULL);
26 } 29 }
27 } 30 }
28 31
29 } // namespace wm 32 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/core/wm_state.h ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698