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

Side by Side Diff: ui/wm/test/wm_test_helper.cc

Issue 243013006: events: Move the PlatformEventSource creation in aura::Env. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/test/wm_test_helper.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/test/wm_test_helper.h" 5 #include "ui/wm/test/wm_test_helper.h"
6 6
7 #include "ui/aura/client/default_activation_client.h" 7 #include "ui/aura/client/default_activation_client.h"
8 #include "ui/aura/client/default_capture_client.h" 8 #include "ui/aura/client/default_capture_client.h"
9 #include "ui/aura/env.h" 9 #include "ui/aura/env.h"
10 #include "ui/aura/test/test_focus_client.h" 10 #include "ui/aura/test/test_focus_client.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 #include "ui/events/platform/platform_event_source.h"
13 #include "ui/wm/core/compound_event_filter.h" 12 #include "ui/wm/core/compound_event_filter.h"
14 #include "ui/wm/core/input_method_event_filter.h" 13 #include "ui/wm/core/input_method_event_filter.h"
15 14
16 namespace wm { 15 namespace wm {
17 16
18 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) { 17 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
19 aura::Env::CreateInstance(); 18 aura::Env::CreateInstance();
20 event_source_ = ui::PlatformEventSource::CreateDefault();
21 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); 19 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size)));
22 host_->InitHost(); 20 host_->InitHost();
23 aura::client::SetWindowTreeClient(host_->window(), this); 21 aura::client::SetWindowTreeClient(host_->window(), this);
24 22
25 focus_client_.reset(new aura::test::TestFocusClient); 23 focus_client_.reset(new aura::test::TestFocusClient);
26 aura::client::SetFocusClient(host_->window(), focus_client_.get()); 24 aura::client::SetFocusClient(host_->window(), focus_client_.get());
27 25
28 root_window_event_filter_ = new wm::CompoundEventFilter; 26 root_window_event_filter_ = new wm::CompoundEventFilter;
29 // Pass ownership of the filter to the root_window. 27 // Pass ownership of the filter to the root_window.
30 host_->window()->SetEventFilter(root_window_event_filter_); 28 host_->window()->SetEventFilter(root_window_event_filter_);
(...skipping 14 matching lines...) Expand all
45 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); 43 root_window_event_filter_->RemoveHandler(input_method_filter_.get());
46 } 44 }
47 45
48 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, 46 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
49 aura::Window* window, 47 aura::Window* window,
50 const gfx::Rect& bounds) { 48 const gfx::Rect& bounds) {
51 return host_->window(); 49 return host_->window();
52 } 50 }
53 51
54 } // namespace wm 52 } // namespace wm
OLDNEW
« no previous file with comments | « ui/wm/test/wm_test_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698