Cleanup: Remove unneeded forward declarations in views.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8536004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110047 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 14 insertions, 37 deletions

diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h
index 7fd76a6..377f128 100644
--- a/views/controls/menu/menu_host.h
+++ b/views/controls/menu/menu_host.h
@@ -13,7 +13,6 @@
 
 namespace views {
 
-class NativeMenuHost;
 class NativeWidget;
 class SubmenuView;
 class View;
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 4111d81..eb6de52 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -9,18 +9,15 @@
 #include <string>
 #include <vector>
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
 #include "base/logging.h"
 #include "base/string16.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/view.h"
 
 #if defined(OS_WIN)
+#include <windows.h>
+
 #include "ui/gfx/native_theme.h"
 #endif
 
@@ -38,7 +35,6 @@ namespace internal {
 class MenuRunnerImpl;
 }
 
-class MenuButton;
 struct MenuConfig;
 class MenuController;
 class MenuDelegate;
diff --git a/views/controls/menu/native_menu_host.h b/views/controls/menu/native_menu_host.h
index 8a1a0f8..44db75a 100644
--- a/views/controls/menu/native_menu_host.h
+++ b/views/controls/menu/native_menu_host.h
@@ -7,12 +7,10 @@
 
 #include "ui/gfx/native_widget_types.h"
 
-namespace gfx {
-class Rect;
-}
-
 namespace views {
+
 class NativeWidget;
+
 namespace internal {
 class NativeMenuHostDelegate;
 }
diff --git a/views/controls/menu/native_menu_host_delegate.h b/views/controls/menu/native_menu_host_delegate.h
index 8baf714..664760a 100644
--- a/views/controls/menu/native_menu_host_delegate.h
+++ b/views/controls/menu/native_menu_host_delegate.h
@@ -6,9 +6,11 @@
 #define VIEWS_CONTROLS_MENU_NATIVE_MENU_HOST_DELEGATE_H_
 
 namespace views {
+
 class MenuHost;
-class RootView;
+
 namespace internal {
+
 class NativeWidgetDelegate;
 
 class NativeMenuHostDelegate {
@@ -28,4 +30,3 @@ class NativeMenuHostDelegate {
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_NATIVE_MENU_HOST_DELEGATE_H_
-
diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.h b/views/controls/scrollbar/native_scroll_bar_gtk.h
index 04acbae..350a48d 100644
--- a/views/controls/scrollbar/native_scroll_bar_gtk.h
+++ b/views/controls/scrollbar/native_scroll_bar_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,8 +11,6 @@
 
 namespace views {
 
-class ScrollBarContainer;
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // NativeScrollBarGtk
@@ -76,5 +74,4 @@ class NativeScrollBarGtk : public NativeControlGtk,
 
 }  // namespace views
 
-#endif  // #ifndef VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_GTK_H_
-
+#endif  // VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_GTK_H_
diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h
index c469999..092bedd 100644
--- a/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.h
@@ -26,8 +26,6 @@
 typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW;
 #endif  // defined(OS_WIN)
 
-class SkBitmap;
-
 namespace gfx {
 class Font;
 }
diff --git a/views/controls/textfield/textfield_views_model.h b/views/controls/textfield/textfield_views_model.h
index 103673b..02d5db8 100644
--- a/views/controls/textfield/textfield_views_model.h
+++ b/views/controls/textfield/textfield_views_model.h
@@ -19,10 +19,7 @@
 #include "views/views_export.h"
 
 namespace gfx {
-class Canvas;
-class Font;
 class RenderText;
-struct StyleRange;
 }  // namespace gfx
 
 namespace ui {
@@ -54,7 +51,6 @@ enum MergeType {
 // It supports editing, selection and cursor manipulation.
 class VIEWS_EXPORT TextfieldViewsModel {
  public:
-
   // Delegate interface implemented by the textfield view class to provided
   // additional functionalities required by the model.
   class VIEWS_EXPORT Delegate {
diff --git a/views/desktop/desktop_window_view.h b/views/desktop/desktop_window_view.h
index 54471c9..3ae9c18 100644
--- a/views/desktop/desktop_window_view.h
+++ b/views/desktop/desktop_window_view.h
@@ -15,7 +15,7 @@ class LayerAnimationSequence;
 }  // namespace ui
 
 namespace views {
-class NativeWidgetViews;
+
 class Widget;
 
 namespace desktop {
diff --git a/views/native_theme_painter.h b/views/native_theme_painter.h
index 5e69aeb..1d52858 100644
--- a/views/native_theme_painter.h
+++ b/views/native_theme_painter.h
@@ -14,10 +14,6 @@ class Canvas;
 class Size;
 }
 
-namespace ui {
-class Animation;
-}
-
 namespace views {
 
 class NativeThemeDelegate;
diff --git a/views/view.h b/views/view.h
index 0b0ae89..fa8c801 100644
--- a/views/view.h
+++ b/views/view.h
@@ -42,7 +42,6 @@ namespace ui {
 struct AccessibleViewState;
 class Compositor;
 class Layer;
-class LayerAnimationSequence;
 class TextInputClient;
 class Texture;
 class ThemeProvider;
diff --git a/views/widget/native_widget_gtk.h b/views/widget/native_widget_gtk.h
index cfd7473..965104e 100644
--- a/views/widget/native_widget_gtk.h
+++ b/views/widget/native_widget_gtk.h
@@ -35,7 +35,6 @@ namespace views {
 
 class DropTargetGtk;
 class InputMethod;
-class TooltipManagerGtk;
 class View;
 
 namespace internal {
diff --git a/views/widget/native_widget_test_utils.h b/views/widget/native_widget_test_utils.h
index cd51d38..9fe73f6 100644
--- a/views/widget/native_widget_test_utils.h
+++ b/views/widget/native_widget_test_utils.h
@@ -7,8 +7,8 @@
 #pragma once
 
 namespace views {
-class View;
 namespace internal {
+
 class NativeWidgetPrivate;
 
 // Create dummy widgets for use in testing.  Caller owns the returned
diff --git a/views/widget/native_widget_wayland.h b/views/widget/native_widget_wayland.h
index 52e29a5..0632c1a 100644
--- a/views/widget/native_widget_wayland.h
+++ b/views/widget/native_widget_wayland.h
@@ -34,7 +34,6 @@ class Rect;
 namespace ui {
 class ViewProp;
 class WaylandDisplay;
-class WaylandInputDevice;
 class WaylandWindow;
 }
 
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 0eac718..456edb2 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -6,6 +6,7 @@
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
+#include <set>
 #include <stack>
 
 #include "base/gtest_prod_util.h"
@@ -35,7 +36,6 @@
 
 namespace gfx {
 class Canvas;
-class Path;
 class Point;
 class Rect;
 }
@@ -56,7 +56,6 @@ class InputMethod;
 class NativeWidget;
 class NonClientFrameView;
 class ScopedEvent;
-class TooltipManager;
 class View;
 class WidgetDelegate;
 namespace internal {
@@ -747,4 +746,4 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
 
 }  // namespace views
 
-#endif // VIEWS_WIDGET_WIDGET_H_
+#endif  // VIEWS_WIDGET_WIDGET_H_