summaryrefslogtreecommitdiffstats
path: root/ash/extended_desktop_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 06:29:54 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 06:29:54 +0000
commit6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03 (patch)
treeb1188d06247a00f4ad2bfb33e48ff19d67e43ea8 /ash/extended_desktop_unittest.cc
parent3ea429189890fd2fc2f71760c4ccb73373ffa9c7 (diff)
downloadchromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.zip
chromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.tar.gz
chromium_src-6b2d4a0b58fedbc3b9c646b05b0eeadddc218e03.tar.bz2
Move GetRootWindowController to root_window_controller.h
Remove unnecessary includes, forward decls BUG=272460 Review URL: https://chromiumcodereview.appspot.com/24020002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
-rw-r--r--ash/extended_desktop_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index d36e824..31dbd15 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -11,7 +11,6 @@
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/coordinate_conversion.h"
-#include "ash/wm/property_util.h"
#include "ash/wm/window_cycle_controller.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
@@ -168,7 +167,7 @@ TEST_F(ExtendedDesktopTest, Basic) {
ASSERT_EQ(2U, root_windows.size());
for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
- EXPECT_TRUE(GetRootWindowController(*iter) != NULL);
+ EXPECT_TRUE(internal::GetRootWindowController(*iter) != NULL);
}
// Make sure root windows share the same controllers.
EXPECT_EQ(aura::client::GetFocusClient(root_windows[0]),