summaryrefslogtreecommitdiffstats
path: root/views/desktop
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 16:21:05 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 16:21:05 +0000
commit7c167e7f7228fd4ba5603cc795cff93ac3d4461b (patch)
treedfac90145abf5b7dfe0c8e2792b8e38dd1b1f434 /views/desktop
parentaa52d072b0d4ef841a87225e64dfe5ba9dc85934 (diff)
downloadchromium_src-7c167e7f7228fd4ba5603cc795cff93ac3d4461b.zip
chromium_src-7c167e7f7228fd4ba5603cc795cff93ac3d4461b.tar.gz
chromium_src-7c167e7f7228fd4ba5603cc795cff93ac3d4461b.tar.bz2
views: Remove duplicated includes of widget.h
R=sky@chromium.org Review URL: http://codereview.chromium.org/7892046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/desktop')
-rw-r--r--views/desktop/desktop_window_manager.cc5
-rw-r--r--views/desktop/desktop_window_manager.h7
2 files changed, 7 insertions, 5 deletions
diff --git a/views/desktop/desktop_window_manager.cc b/views/desktop/desktop_window_manager.cc
index dad7ef1..2b3c71b 100644
--- a/views/desktop/desktop_window_manager.cc
+++ b/views/desktop/desktop_window_manager.cc
@@ -4,15 +4,14 @@
#include "views/desktop/desktop_window_manager.h"
-#include "views/events/event.h"
-#include "views/widget/widget.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
-#include "views/widget/widget.h"
+#include "views/events/event.h"
#include "views/widget/native_widget_private.h"
#include "views/widget/native_widget_view.h"
#include "views/widget/native_widget_views.h"
#include "views/widget/widget_delegate.h"
+
#if defined(OS_LINUX)
#include "views/window/hit_test.h"
#endif
diff --git a/views/desktop/desktop_window_manager.h b/views/desktop/desktop_window_manager.h
index c6e2d32..e4cf9e8 100644
--- a/views/desktop/desktop_window_manager.h
+++ b/views/desktop/desktop_window_manager.h
@@ -4,21 +4,24 @@
#ifndef VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
#define VIEWS_DESKTOP_DESKTOP_WINDOW_MANAGER_H_
+#pragma once
+#include <vector>
+
+#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/scoped_ptr.h"
#include "views/widget/widget.h"
#include "views/widget/window_manager.h"
-#include <vector>
namespace gfx {
class Point;
}
namespace views {
-
namespace desktop {
+
class WindowController;
// A tentative window manager for views destktop until we have *right*