Some minor fixes to remove unnecessary includes and do fwd declaration instead.

Review URL: http://codereview.chromium.org/3202003

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

6 files changed, 40 insertions, 33 deletions

diff --git a/chrome/browser/views/accessibility_event_router_views.cc b/chrome/browser/views/accessibility_event_router_views.cc
index 4f2d7ff..71c75e7 100644
--- a/chrome/browser/views/accessibility_event_router_views.cc
+++ b/chrome/browser/views/accessibility_event_router_views.cc
@@ -18,9 +18,9 @@
 #include "views/controls/link.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
+#include "views/view.h"
 
 using views::FocusManager;
-using views::View;
 
 AccessibilityEventRouterViews::AccessibilityEventRouterViews()
     : most_recent_profile_(NULL),
@@ -35,7 +35,8 @@ AccessibilityEventRouterViews* AccessibilityEventRouterViews::GetInstance() {
   return Singleton<AccessibilityEventRouterViews>::get();
 }
 
-bool AccessibilityEventRouterViews::AddViewTree(View* view, Profile* profile) {
+bool AccessibilityEventRouterViews::AddViewTree(
+    views::View* view, Profile* profile) {
   if (view_tree_profile_map_[view] != NULL)
     return false;
 
@@ -43,21 +44,22 @@ bool AccessibilityEventRouterViews::AddViewTree(View* view, Profile* profile) {
   return true;
 }
 
-void AccessibilityEventRouterViews::RemoveViewTree(View* view) {
+void AccessibilityEventRouterViews::RemoveViewTree(views::View* view) {
   DCHECK(view_tree_profile_map_.find(view) !=
          view_tree_profile_map_.end());
   view_tree_profile_map_.erase(view);
 }
 
-void AccessibilityEventRouterViews::IgnoreView(View* view) {
+void AccessibilityEventRouterViews::IgnoreView(views::View* view) {
   view_info_map_[view].ignore = true;
 }
 
-void AccessibilityEventRouterViews::SetViewName(View* view, std::string name) {
+void AccessibilityEventRouterViews::SetViewName(
+    views::View* view, std::string name) {
   view_info_map_[view].name = name;
 }
 
-void AccessibilityEventRouterViews::RemoveView(View* view) {
+void AccessibilityEventRouterViews::RemoveView(views::View* view) {
   DCHECK(view_info_map_.find(view) != view_info_map_.end());
   view_info_map_.erase(view);
 }
@@ -87,11 +89,11 @@ void AccessibilityEventRouterViews::HandleAccessibilityEvent(
 //
 
 void AccessibilityEventRouterViews::FindView(
-    View* view, Profile** profile, bool* is_accessible) {
+    views::View* view, Profile** profile, bool* is_accessible) {
   *is_accessible = false;
 
   // First see if it's a descendant of an accessible view.
-  for (base::hash_map<View*, Profile*>::const_iterator iter =
+  for (base::hash_map<views::View*, Profile*>::const_iterator iter =
            view_tree_profile_map_.begin();
        iter != view_tree_profile_map_.end();
        ++iter) {
@@ -106,17 +108,17 @@ void AccessibilityEventRouterViews::FindView(
     return;
 
   // Now make sure it's not marked as a widget to be ignored.
-  base::hash_map<View*, ViewInfo>::const_iterator iter =
+  base::hash_map<views::View*, ViewInfo>::const_iterator iter =
       view_info_map_.find(view);
   if (iter != view_info_map_.end() && iter->second.ignore)
     *is_accessible = false;
 }
 
-std::string AccessibilityEventRouterViews::GetViewName(View* view) {
+std::string AccessibilityEventRouterViews::GetViewName(views::View* view) {
   std::string name;
 
   // First see if we have a name registered for this view.
-  base::hash_map<View*, ViewInfo>::const_iterator iter =
+  base::hash_map<views::View*, ViewInfo>::const_iterator iter =
       view_info_map_.find(view);
   if (iter != view_info_map_.end())
     name = iter->second.name;
@@ -132,7 +134,7 @@ std::string AccessibilityEventRouterViews::GetViewName(View* view) {
 }
 
 void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
-    View* view, NotificationType type) {
+    views::View* view, NotificationType type) {
   Profile* profile = NULL;
   bool is_accessible;
   FindView(view, &profile, &is_accessible);
@@ -172,25 +174,25 @@ void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
 }
 
 void AccessibilityEventRouterViews::SendButtonNotification(
-    View* view, NotificationType type, Profile* profile) {
+    views::View* view, NotificationType type, Profile* profile) {
   AccessibilityButtonInfo info(profile, GetViewName(view));
   SendAccessibilityNotification(type, &info);
 }
 
 void AccessibilityEventRouterViews::SendLinkNotification(
-    View* view, NotificationType type, Profile* profile) {
+    views::View* view, NotificationType type, Profile* profile) {
   AccessibilityLinkInfo info(profile, GetViewName(view));
   SendAccessibilityNotification(type, &info);
 }
 
 void AccessibilityEventRouterViews::SendMenuNotification(
-    View* view, NotificationType type, Profile* profile) {
+    views::View* view, NotificationType type, Profile* profile) {
   AccessibilityMenuInfo info(profile, GetViewName(view));
   SendAccessibilityNotification(type, &info);
 }
 
 void AccessibilityEventRouterViews::SendMenuItemNotification(
-    View* view, NotificationType type, Profile* profile) {
+    views::View* view, NotificationType type, Profile* profile) {
   std::string name = GetViewName(view);
 
   bool has_submenu = false;
@@ -200,7 +202,7 @@ void AccessibilityEventRouterViews::SendMenuItemNotification(
   if (view->GetClassName() == views::MenuItemView::kViewClassName)
     has_submenu = static_cast<views::MenuItemView*>(view)->HasSubmenu();
 
-  View* parent_menu = view->GetParent();
+  views::View* parent_menu = view->GetParent();
   while (parent_menu != NULL && parent_menu->GetClassName() !=
          views::SubmenuView::kViewClassName) {
     parent_menu = parent_menu->GetParent();
@@ -234,7 +236,7 @@ void AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
 }
 
 bool AccessibilityEventRouterViews::IsMenuEvent(
-    View* view, NotificationType type) {
+    views::View* view, NotificationType type) {
   if (type == NotificationType::ACCESSIBILITY_MENU_OPENED ||
       type == NotificationType::ACCESSIBILITY_MENU_CLOSED)
     return true;
diff --git a/chrome/browser/views/accessibility_event_router_views.h b/chrome/browser/views/accessibility_event_router_views.h
index aa2054f..ae79df0 100644
--- a/chrome/browser/views/accessibility_event_router_views.h
+++ b/chrome/browser/views/accessibility_event_router_views.h
@@ -14,10 +14,12 @@
 #include "base/singleton.h"
 #include "base/task.h"
 #include "chrome/browser/accessibility_events.h"
-#include "views/view.h"
-#include "views/widget/root_view.h"
+#include "views/accessibility/accessibility_types.h"
 
 class Profile;
+namespace views {
+class View;
+}
 
 // Allows us to use (View*) in a hash_map with gcc.
 #if defined(COMPILER_GCC)
diff --git a/chrome/browser/views/accessible_toolbar_view.cc b/chrome/browser/views/accessible_toolbar_view.cc
index 8c8fb88..a06a342 100644
--- a/chrome/browser/views/accessible_toolbar_view.cc
+++ b/chrome/browser/views/accessible_toolbar_view.cc
@@ -18,13 +18,13 @@ AccessibleToolbarView::AccessibleToolbarView()
     : toolbar_has_focus_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       focus_manager_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(focus_search_(this, true, true)),
       home_key_(base::VKEY_HOME, false, false, false),
       end_key_(base::VKEY_END, false, false, false),
       escape_key_(base::VKEY_ESCAPE, false, false, false),
       left_key_(base::VKEY_LEFT, false, false, false),
       right_key_(base::VKEY_RIGHT, false, false, false),
       last_focused_view_storage_id_(-1) {
+  focus_search_.reset(new views::FocusSearch(this, true, true));
 }
 
 AccessibleToolbarView::~AccessibleToolbarView() {
@@ -118,7 +118,7 @@ void AccessibleToolbarView::RestoreLastFocusedView() {
 views::View* AccessibleToolbarView::GetFirstFocusableChild() {
   FocusTraversable* dummy_focus_traversable;
   views::View* dummy_focus_traversable_view;
-  return focus_search_.FindNextFocusableView(
+  return focus_search_->FindNextFocusableView(
       NULL, false, views::FocusSearch::DOWN, false,
       &dummy_focus_traversable, &dummy_focus_traversable_view);
 }
@@ -126,7 +126,7 @@ views::View* AccessibleToolbarView::GetFirstFocusableChild() {
 views::View* AccessibleToolbarView::GetLastFocusableChild() {
   FocusTraversable* dummy_focus_traversable;
   views::View* dummy_focus_traversable_view;
-  return focus_search_.FindNextFocusableView(
+  return focus_search_->FindNextFocusableView(
       this, true, views::FocusSearch::DOWN, false,
       &dummy_focus_traversable, &dummy_focus_traversable_view);
 }
@@ -223,7 +223,7 @@ void AccessibleToolbarView::FocusWillChange(views::View* focused_before,
 
 views::FocusSearch* AccessibleToolbarView::GetFocusSearch() {
   DCHECK(toolbar_has_focus_);
-  return &focus_search_;
+  return focus_search_.get();
 }
 
 views::FocusTraversable* AccessibleToolbarView::GetFocusTraversableParent() {
diff --git a/chrome/browser/views/accessible_toolbar_view.h b/chrome/browser/views/accessible_toolbar_view.h
index e7f3e027..a5bd925 100644
--- a/chrome/browser/views/accessible_toolbar_view.h
+++ b/chrome/browser/views/accessible_toolbar_view.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/hash_tables.h"
+#include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/views/accessibility_event_router_views.h"
 #include "views/focus/focus_manager.h"
 #include "views/view.h"
 
@@ -79,7 +79,7 @@ class AccessibleToolbarView : public views::View,
   // Our custom focus search implementation that traps focus in this
   // toolbar and traverses all views that are focusable for accessibility,
   // not just those that are normally focusable.
-  views::FocusSearch focus_search_;
+  scoped_ptr<views::FocusSearch> focus_search_;
 
   // Registered accelerators
   views::Accelerator home_key_;
diff --git a/chrome/browser/views/accessible_view_helper.cc b/chrome/browser/views/accessible_view_helper.cc
index f173761..63f381b 100644
--- a/chrome/browser/views/accessible_view_helper.cc
+++ b/chrome/browser/views/accessible_view_helper.cc
@@ -7,13 +7,13 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/views/accessibility_event_router_views.h"
 #include "chrome/common/notification_service.h"
 #include "views/widget/widget.h"
-
-using views::View;
+#include "views/view.h"
 
 AccessibleViewHelper::AccessibleViewHelper(
-    View* view_tree, Profile* profile)
+    views::View* view_tree, Profile* profile)
     : accessibility_event_router_(AccessibilityEventRouterViews::GetInstance()),
       profile_(profile),
       view_tree_(view_tree) {
@@ -53,7 +53,7 @@ void AccessibleViewHelper::SendOpenWindowNotification(
       Details<AccessibilityWindowInfo>(&info));
 }
 
-void AccessibleViewHelper::IgnoreView(View* view) {
+void AccessibleViewHelper::IgnoreView(views::View* view) {
   if (!view_tree_)
     return;
 
@@ -61,7 +61,7 @@ void AccessibleViewHelper::IgnoreView(View* view) {
   managed_views_.push_back(view);
 }
 
-void AccessibleViewHelper::SetViewName(View* view, std::string name) {
+void AccessibleViewHelper::SetViewName(views::View* view, std::string name) {
   if (!view_tree_)
     return;
 
@@ -69,7 +69,7 @@ void AccessibleViewHelper::SetViewName(View* view, std::string name) {
   managed_views_.push_back(view);
 }
 
-void AccessibleViewHelper::SetViewName(View* view, int string_id) {
+void AccessibleViewHelper::SetViewName(views::View* view, int string_id) {
   if (!view_tree_)
     return;
 
diff --git a/chrome/browser/views/accessible_view_helper.h b/chrome/browser/views/accessible_view_helper.h
index f5b2627..2f6f434 100644
--- a/chrome/browser/views/accessible_view_helper.h
+++ b/chrome/browser/views/accessible_view_helper.h
@@ -13,13 +13,16 @@
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "chrome/browser/accessibility_events.h"
-#include "chrome/browser/views/accessibility_event_router_views.h"
 
 #if defined(OS_LINUX)
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #endif
 
+class AccessibilityEventRouterViews;
 class Profile;
+namespace views {
+class View;
+}
 
 // NOTE: This class is part of the Accessibility Extension API, which lets
 // extensions receive accessibility events. It's distinct from code that