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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/views/win/hwnd_util_aurawin.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 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/root_window.h"
11 #include "ui/aura/test/test_focus_client.h" 10 #include "ui/aura/test/test_focus_client.h"
11 #include "ui/aura/window_event_dispatcher.h"
12 #include "ui/views/corewm/compound_event_filter.h" 12 #include "ui/views/corewm/compound_event_filter.h"
13 #include "ui/views/corewm/input_method_event_filter.h" 13 #include "ui/views/corewm/input_method_event_filter.h"
14 14
15 namespace wm { 15 namespace wm {
16 16
17 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) { 17 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
18 aura::Env::CreateInstance(); 18 aura::Env::CreateInstance();
19 dispatcher_.reset(new aura::WindowEventDispatcher( 19 dispatcher_.reset(new aura::WindowEventDispatcher(
20 aura::WindowEventDispatcher::CreateParams( 20 aura::WindowEventDispatcher::CreateParams(
21 gfx::Rect(default_window_size)))); 21 gfx::Rect(default_window_size))));
(...skipping 24 matching lines...) Expand all
46 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); 46 root_window_event_filter_->RemoveHandler(input_method_filter_.get());
47 } 47 }
48 48
49 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, 49 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
50 aura::Window* window, 50 aura::Window* window,
51 const gfx::Rect& bounds) { 51 const gfx::Rect& bounds) {
52 return dispatcher_->window(); 52 return dispatcher_->window();
53 } 53 }
54 54
55 } // namespace wm 55 } // namespace wm
OLDNEW
« no previous file with comments | « ui/views/win/hwnd_util_aurawin.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698