Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: chrome/browser/views/accessible_toolbar_view.cc

Issue 3202003: Some minor fixes to remove unnecessary includes and do fwd declaration instea... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/accessible_toolbar_view.h ('k') | chrome/browser/views/accessible_view_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/accessible_toolbar_view.cc
===================================================================
--- chrome/browser/views/accessible_toolbar_view.cc (revision 56977)
+++ chrome/browser/views/accessible_toolbar_view.cc (working copy)
@@ -18,13 +18,13 @@
: 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 @@
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::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 @@
views::FocusSearch* AccessibleToolbarView::GetFocusSearch() {
DCHECK(toolbar_has_focus_);
- return &focus_search_;
+ return focus_search_.get();
}
views::FocusTraversable* AccessibleToolbarView::GetFocusTraversableParent() {
« no previous file with comments | « chrome/browser/views/accessible_toolbar_view.h ('k') | chrome/browser/views/accessible_view_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698