summaryrefslogtreecommitdiffstats
path: root/ash/tooltips/tooltip_controller_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:33:13 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:33:13 +0000
commitc9390bdfb5727b3c5ecc2ed8f97725c9514ecac8 (patch)
tree56578aea7dcb93045b61f4615210b7b8edacf102 /ash/tooltips/tooltip_controller_unittest.cc
parent9af0b83e7ce94d9e5c61623ab76634f97374c517 (diff)
downloadchromium_src-c9390bdfb5727b3c5ecc2ed8f97725c9514ecac8.zip
chromium_src-c9390bdfb5727b3c5ecc2ed8f97725c9514ecac8.tar.gz
chromium_src-c9390bdfb5727b3c5ecc2ed8f97725c9514ecac8.tar.bz2
Eliminate Shell::RootWindowList in favor of aura::Window::Windows.
This is necessary as part of my plan to rework RootWindow, specifically making it not be a subclass of Window. (It will eventually be renamed WindowEventDispatcher). Code that expected to get the RootWindow interface from this type can still call GetDispatcher() on members of the returned vector of Windows. R=oshima@chromium.org http://crbug.com/308843 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=233787 Review URL: https://codereview.chromium.org/64933002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips/tooltip_controller_unittest.cc')
-rw-r--r--ash/tooltips/tooltip_controller_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 2b510a9..25b2f01 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -138,7 +138,7 @@ TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) {
return;
UpdateDisplay("1000x600,600x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
scoped_ptr<views::Widget> widget1(CreateNewWidgetWithBoundsOn(
0, gfx::Rect(10, 10, 100, 100)));
TooltipTestView* view1 = new TooltipTestView;