From f7c05b242215b26ff09102fdf0bf9a911cec9329 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Tue, 12 Nov 2013 21:07:24 +0000 Subject: 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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=234428 Review URL: https://codereview.chromium.org/68313003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234634 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/root_window_controller.h | 1 + 1 file changed, 1 insertion(+) (limited to 'ash/root_window_controller.h') diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 980bf1e..0ccc1d3 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -14,6 +14,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/root_window.h" +#include "ui/aura/window.h" #include "ui/base/ui_base_types.h" class SkBitmap; -- cgit v1.1