summaryrefslogtreecommitdiffstats
path: root/ui/wm
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 05:19:32 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 05:19:32 +0000
commit056ce05075d1eccc591007b553acf1a77c9984da (patch)
tree0120aab5ede38d13baf801b95b18f2c073657721 /ui/wm
parent21d32ecf459324e55d24a84a4fc89d9166fa4fc8 (diff)
downloadchromium_src-056ce05075d1eccc591007b553acf1a77c9984da.zip
chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.gz
chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.bz2
Rename RootWindow -> WindowEventDispatcher.
http://crbug.com/308843 R=sky@chromium.org Review URL: https://codereview.chromium.org/172743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/wm')
-rw-r--r--ui/wm/test/wm_test_helper.cc22
-rw-r--r--ui/wm/test/wm_test_helper.h8
2 files changed, 15 insertions, 15 deletions
diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc
index d32cf65..bb1753d 100644
--- a/ui/wm/test/wm_test_helper.cc
+++ b/ui/wm/test/wm_test_helper.cc
@@ -16,30 +16,30 @@ namespace wm {
WMTestHelper::WMTestHelper(const gfx::Size& default_window_size) {
aura::Env::CreateInstance();
- root_window_.reset(new aura::RootWindow(
- aura::RootWindow::CreateParams(
+ dispatcher_.reset(new aura::WindowEventDispatcher(
+ aura::WindowEventDispatcher::CreateParams(
gfx::Rect(default_window_size))));
- root_window_->host()->InitHost();
- aura::client::SetWindowTreeClient(root_window_->window(), this);
+ dispatcher_->host()->InitHost();
+ aura::client::SetWindowTreeClient(dispatcher_->window(), this);
focus_client_.reset(new aura::test::TestFocusClient);
- aura::client::SetFocusClient(root_window_->window(), focus_client_.get());
+ aura::client::SetFocusClient(dispatcher_->window(), focus_client_.get());
root_window_event_filter_ = new views::corewm::CompoundEventFilter;
// Pass ownership of the filter to the root_window.
- root_window_->window()->SetEventFilter(root_window_event_filter_);
+ dispatcher_->window()->SetEventFilter(root_window_event_filter_);
input_method_filter_.reset(new views::corewm::InputMethodEventFilter(
- root_window_->host()->GetAcceleratedWidget()));
+ dispatcher_->host()->GetAcceleratedWidget()));
input_method_filter_->SetInputMethodPropertyInRootWindow(
- root_window_->window());
+ dispatcher_->window());
root_window_event_filter_->AddHandler(input_method_filter_.get());
activation_client_.reset(
- new aura::client::DefaultActivationClient(root_window_->window()));
+ new aura::client::DefaultActivationClient(dispatcher_->window()));
capture_client_.reset(
- new aura::client::DefaultCaptureClient(root_window_->window()));
+ new aura::client::DefaultCaptureClient(dispatcher_->window()));
}
WMTestHelper::~WMTestHelper() {
@@ -49,7 +49,7 @@ WMTestHelper::~WMTestHelper() {
aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) {
- return root_window_->window();
+ return dispatcher_->window();
}
} // namespace wm
diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h
index ba23ee7..da2d153 100644
--- a/ui/wm/test/wm_test_helper.h
+++ b/ui/wm/test/wm_test_helper.h
@@ -10,8 +10,8 @@
#include "ui/aura/client/window_tree_client.h"
namespace aura {
-class RootWindow;
class Window;
+class WindowEventDispatcher;
namespace client {
class DefaultActivationClient;
class DefaultCaptureClient;
@@ -41,7 +41,7 @@ class WMTestHelper : public aura::client::WindowTreeClient {
explicit WMTestHelper(const gfx::Size& default_window_size);
virtual ~WMTestHelper();
- aura::RootWindow* root_window() { return root_window_.get(); }
+ aura::WindowEventDispatcher* dispatcher() { return dispatcher_.get(); }
// Overridden from client::WindowTreeClient:
virtual aura::Window* GetDefaultParent(aura::Window* context,
@@ -49,9 +49,9 @@ class WMTestHelper : public aura::client::WindowTreeClient {
const gfx::Rect& bounds) OVERRIDE;
private:
- scoped_ptr<aura::RootWindow> root_window_;
+ scoped_ptr<aura::WindowEventDispatcher> dispatcher_;
- // Owned by RootWindow
+ // Owned by the root Window.
views::corewm::CompoundEventFilter* root_window_event_filter_;
scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;