diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 23:01:45 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 23:01:45 +0000 |
commit | 74dd2037fe17e9b86b095444425dd93ac19faa4b (patch) | |
tree | 73933628636520a9ec9aa4c44a3dcadb66da1c5c | |
parent | 13274e77cb24e79a976577671faf942ae1408394 (diff) | |
download | chromium_src-74dd2037fe17e9b86b095444425dd93ac19faa4b.zip chromium_src-74dd2037fe17e9b86b095444425dd93ac19faa4b.tar.gz chromium_src-74dd2037fe17e9b86b095444425dd93ac19faa4b.tar.bz2 |
These files were meant to go with my change here http://codereview.chromium.org/6577017
BUG=72040
TEST=none
TBR=sky
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75983 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | views/controls/tabbed_pane/native_tabbed_pane_gtk.cc | 2 | ||||
-rw-r--r-- | views/focus/focus_manager.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 0b47abde..02d5fe6 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -153,7 +153,7 @@ void NativeTabbedPaneGtk::DoAddTabAtIndex(int index, const std::wstring& title, WidgetGtk* page_container = new WidgetGtk(WidgetGtk::TYPE_CHILD); page_container->Init(NULL, gfx::Rect()); page_container->SetContentsView(contents); - page_container->SetFocusTraversableParent(GetRootView()); + page_container->SetFocusTraversableParent(GetWidget()->GetFocusTraversable()); page_container->SetFocusTraversableParentView(this); page_container->Show(); diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h index e58577a..46a867e 100644 --- a/views/focus/focus_manager.h +++ b/views/focus/focus_manager.h @@ -54,17 +54,17 @@ // the focus traversal traverse down the focus hierarchy to enter the nested // RootView. In the example mentioned above, the NativeControl overrides // GetFocusTraversable() and returns hwnd_view_container_->GetRootView(). -// - call RootView::SetFocusTraversableParent() on the nested RootView and point -// it to the outter RootView. This is used when the focus goes out of the +// - call Widget::SetFocusTraversableParent() on the nested RootView and point +// it to the outer RootView. This is used when the focus goes out of the // nested RootView. In the example: -// hwnd_view_container_->GetRootView()->SetFocusTraversableParent( +// hwnd_view_container_->GetWidget()->SetFocusTraversableParent( // native_control->GetRootView()); // - call RootView::SetFocusTraversableParentView() on the nested RootView with // the parent view that directly contains the native window. This is needed // when traversing up from the nested RootView to know which view to start // with when going to the next/previous view. // In our example: -// hwnd_view_container_->GetRootView()->SetFocusTraversableParent( +// hwnd_view_container_->GetWidget()->SetFocusTraversableParent( // native_control); // // Note that FocusTraversable do not have to be RootViews: AccessibleToolbarView |