diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 21:07:24 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 21:07:24 +0000 |
commit | f7c05b242215b26ff09102fdf0bf9a911cec9329 (patch) | |
tree | 9c77f68f230c22e29a15f5b78713c7ba335a8c01 /ash/root_window_controller.h | |
parent | 49939c1ac5bda33a232917ac126b5d233920aa2f (diff) | |
download | chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.zip chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.tar.gz chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.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
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
Diffstat (limited to 'ash/root_window_controller.h')
-rw-r--r-- | ash/root_window_controller.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |