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

chrome/browser/views/accessible_toolbar_view.cc

 // Copyright (c) 2010 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.
 
 #include "base/logging.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_search.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 
 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() {
   if (toolbar_has_focus_) {
     focus_manager_->RemoveFocusChangeListener(this);
   }
 }
 
 bool AccessibleToolbarView::SetToolbarFocus(int view_storage_id,
                                             views::View* initial_focus) {
@@ skipping 73 matching lines @@
     if (view) {
       BrowserView* browser_view = static_cast<BrowserView*>(view);
       browser_view->SetFocusToLocationBar(false);
     }
   }
 }
 
 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);
 }
 
 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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // View overrides:
 
 views::FocusTraversable* AccessibleToolbarView::GetPaneFocusTraversable() {
   if (toolbar_has_focus_)
     return this;
@@ skipping 76 matching lines @@
         FROM_HERE, method_factory_.NewRunnableMethod(
             &AccessibleToolbarView::RemoveToolbarFocus));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusTraversable overrides:
 
 views::FocusSearch* AccessibleToolbarView::GetFocusSearch() {
   DCHECK(toolbar_has_focus_);
-  return &focus_search_;
+  return focus_search_.get();
 }
 
 views::FocusTraversable* AccessibleToolbarView::GetFocusTraversableParent() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }
 
 views::View* AccessibleToolbarView::GetFocusTraversableParentView() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }