views: Rename IsFocusableInRootView() to just IsFocusable().

BUG=105879
R=ben@chromium.org

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

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

15 files changed, 17 insertions, 19 deletions

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index aed2280..9964a14 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -460,7 +460,7 @@ void LocationBarView::SetLocationEntryFocusable(bool focusable) {
 bool LocationBarView::IsLocationEntryFocusableInRootView() const {
   return views::Widget::IsPureViews() ?
       AsViews(location_entry_.get())->IsLocationEntryFocusableInRootView() :
-      views::View::IsFocusableInRootView();
+      views::View::IsFocusable();
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 903aaf1..bcc3cf3 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -302,7 +302,7 @@ void OmniboxViewViews::SetLocationEntryFocusable(bool focusable) {
 }
 
 bool OmniboxViewViews::IsLocationEntryFocusableInRootView() const {
-  return textfield_->IsFocusableInRootView();
+  return textfield_->IsFocusable();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
index 5a5a115..088b1dd 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
@@ -94,7 +94,7 @@ bool NativeTabContentsContainerAura::SkipDefaultKeyEventProcessing(
          !container_->tab_contents()->is_crashed();
 }
 
-bool NativeTabContentsContainerAura::IsFocusableInRootView() const {
+bool NativeTabContentsContainerAura::IsFocusable() const {
   // We need to be focusable when our contents is not a view hierarchy, as
   // clicking on the contents needs to focus us.
   return container_->tab_contents() != NULL;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.h
index 2877c8e..cdd967a 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.h
@@ -28,7 +28,7 @@ class NativeTabContentsContainerAura : public NativeTabContentsContainer,
 
   // Overridden from views::View:
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
-  virtual bool IsFocusableInRootView() const OVERRIDE;
+  virtual bool IsFocusable() const OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void RequestFocus() OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
index 74681c5..e6e1dc7 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
@@ -97,7 +97,7 @@ views::FocusTraversable* NativeTabContentsContainerGtk::GetFocusTraversable() {
   return NULL;
 }
 
-bool NativeTabContentsContainerGtk::IsFocusableInRootView() const {
+bool NativeTabContentsContainerGtk::IsFocusable() const {
   // We need to be focusable when our contents is not a view hierarchy, as
   // clicking on the contents needs to focus us.
   return container_->tab_contents() != NULL;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
index 1a79f35..5d1c148 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
@@ -31,7 +31,7 @@ class NativeTabContentsContainerGtk : public NativeTabContentsContainer,
   // Overridden from views::View:
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
   virtual views::FocusTraversable* GetFocusTraversable() OVERRIDE;
-  virtual bool IsFocusableInRootView() const OVERRIDE;
+  virtual bool IsFocusable() const OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void RequestFocus() OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
index 503de39..eb4e191 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
@@ -105,7 +105,7 @@ bool NativeTabContentsContainerWin::SkipDefaultKeyEventProcessing(
          !container_->tab_contents()->is_crashed();
 }
 
-bool NativeTabContentsContainerWin::IsFocusableInRootView() const {
+bool NativeTabContentsContainerWin::IsFocusable() const {
   // We need to be focusable when our contents is not a view hierarchy, as
   // clicking on the contents needs to focus us.
   return container_->tab_contents() != NULL;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
index eabc0e2..ee9e614 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
@@ -28,7 +28,7 @@ class NativeTabContentsContainerWin : public NativeTabContentsContainer,
 
   // Overridden from views::View:
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
-  virtual bool IsFocusableInRootView() const OVERRIDE;
+  virtual bool IsFocusable() const OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void RequestFocus() OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index 25545a4..4f44b7b 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -218,7 +218,7 @@ void TabContentsViewViews::RestoreFocus() {
     // If you hit this DCHECK, please report it to Jay (jcampan).
     DCHECK(focus_manager != NULL) << "No focus manager when restoring focus.";
 
-    if (last_focused_view->IsFocusableInRootView() && focus_manager &&
+    if (last_focused_view->IsFocusable() && focus_manager &&
         focus_manager->ContainsView(last_focused_view)) {
       last_focused_view->RequestFocus();
     } else {
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 8a6e5c5..56e97f9 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -108,7 +108,7 @@ static View* GetFirstFocusableView(View* view, int start, bool forward) {
         return deepest;
     }
   }
-  return view->IsFocusableInRootView() ? view : NULL;
+  return view->IsFocusable() ? view : NULL;
 }
 
 // Returns the first child of |start| that is focusable.
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index ca2a55f..b1db57b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -297,8 +297,7 @@ void FocusManager::RestoreFocusedView() {
   View* view = view_storage->RetrieveView(stored_focused_view_storage_id_);
   if (view) {
     if (ContainsView(view)) {
-      if (!view->IsFocusableInRootView() &&
-          view->IsAccessibilityFocusableInRootView()) {
+      if (!view->IsFocusable() && view->IsAccessibilityFocusableInRootView()) {
         // RequestFocus would fail, but we want to restore focus to controls
         // that had focus in accessibility mode.
         SetFocusedViewWithReason(view, kReasonFocusRestore);
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
index 56ec02f..f6b3e96 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -102,7 +102,7 @@ bool FocusSearch::IsFocusable(View* v) {
   if (accessibility_mode_)
     return v && v->IsAccessibilityFocusableInRootView();
 
-  return v && v->IsFocusableInRootView();
+  return v && v->IsFocusable();
 }
 
 View* FocusSearch::FindSelectedViewForGroup(View* view) {
diff --git a/ui/views/focus/focus_search.h b/ui/views/focus/focus_search.h
index 50ba6f8..508111b5 100644
--- a/ui/views/focus/focus_search.h
+++ b/ui/views/focus/focus_search.h
@@ -36,7 +36,7 @@ class VIEWS_EXPORT FocusSearch {
   //           out, even if it's the same view.
   // - |accessibility_mode| should be true if full keyboard accessibility is
   //   needed and you  want to check IsAccessibilityFocusableInRootView(),
-  //   rather than IsFocusableInRootView().
+  //   rather than IsFocusable().
   FocusSearch(View* root, bool cycle, bool accessibility_mode);
   virtual ~FocusSearch() {}
 
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 244f261..f260e37 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -894,7 +894,7 @@ void View::SetNextFocusableView(View* view) {
   next_focusable_view_ = view;
 }
 
-bool View::IsFocusableInRootView() const {
+bool View::IsFocusable() const {
   return focusable_ && enabled_ && IsDrawn();
 }
 
@@ -914,7 +914,7 @@ const FocusManager* View::GetFocusManager() const {
 
 void View::RequestFocus() {
   FocusManager* focus_manager = GetFocusManager();
-  if (focus_manager && IsFocusableInRootView())
+  if (focus_manager && IsFocusable())
     focus_manager->SetFocusedView(this);
 }
 
diff --git a/ui/views/view.h b/ui/views/view.h
index 15aeb38..7dbd96c 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -669,9 +669,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // Returns true if this view is capable of taking focus.
   bool focusable() const { return focusable_ && enabled_ && visible_; }
 
-  // Returns true if the view is focusable (IsFocusable) and visible in the root
-  // view. See also IsFocusable.
-  virtual bool IsFocusableInRootView() const;
+  // Returns true if this view is |focusable_|, |enabled_| and drawn.
+  virtual bool IsFocusable() const;
 
   // Return whether this view is focusable when the user requires full keyboard
   // access, even though it may not be normally focusable.