diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 06:16:08 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 06:16:08 +0000 |
| commit | 688c225e6f3825179e1b8d706f05e4438fa1e36a (patch) | |
| tree | a4b7ce2c97553f52b6fb89a75b37b3e00bc62505 /ui/views/corewm/tooltip_controller_unittest.cc | |
| parent | 6ed843366f5ee413ca48f1ad245ab0000981b8f6 (diff) | |
| download | chromium_src-688c225e6f3825179e1b8d706f05e4438fa1e36a.zip chromium_src-688c225e6f3825179e1b8d706f05e4438fa1e36a.tar.gz chromium_src-688c225e6f3825179e1b8d706f05e4438fa1e36a.tar.bz2 | |
Use Window instead of RootWindow in many more places throughout the codebase
TBR=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/66653005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/corewm/tooltip_controller_unittest.cc')
| -rw-r--r-- | ui/views/corewm/tooltip_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index 1a5db6b..6ebf4b9 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -41,7 +41,7 @@ namespace corewm { namespace test { namespace { -views::Widget* CreateWidget(aura::RootWindow* root) { +views::Widget* CreateWidget(aura::Window* root) { views::Widget* widget = new views::Widget; views::Widget::InitParams params; params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS; @@ -93,7 +93,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase { virtual void TearDown() OVERRIDE { #if defined(OS_CHROMEOS) root_window()->RemovePreTargetHandler(controller_.get()); - SetTooltipClient(root_window(), NULL); + aura::client::SetTooltipClient(root_window(), NULL); controller_.reset(); #endif generator_.reset(); |