summaryrefslogtreecommitdiffstats
path: root/ui/app_list
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 06:11:48 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 06:11:48 +0000
commit94f3d3ecb30a753a00538a71f2d1b41e42c7afad (patch)
tree9b25d7b3c7fad8cce1cc25f8b541babfbb9acb89 /ui/app_list
parent821f018576b0de208850b129e36d38898b3df7e0 (diff)
downloadchromium_src-94f3d3ecb30a753a00538a71f2d1b41e42c7afad.zip
chromium_src-94f3d3ecb30a753a00538a71f2d1b41e42c7afad.tar.gz
chromium_src-94f3d3ecb30a753a00538a71f2d1b41e42c7afad.tar.bz2
Make RootWindow not subclass Window.
Removes the #include of window.h from root_window.h too, which makes this CL a little longer bandaiding all those places. The interesting parts of this change are in root_window.* and window.* R=sky@chromium.org http://crbug.com/308843 Review URL: https://codereview.chromium.org/68313003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
-rw-r--r--ui/app_list/views/apps_grid_view.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index 482a7ce..fb8d6da2 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -28,6 +28,7 @@
#if defined(USE_AURA)
#include "ui/aura/root_window.h"
+#include "ui/aura/window.h"
#endif
#if defined(OS_WIN) && !defined(USE_AURA)