diff options
Diffstat (limited to 'chrome/browser/ui/views/find_bar_host.cc')
| -rw-r--r-- | chrome/browser/ui/views/find_bar_host.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 2324bf2..2320445 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/views/find_bar_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/web_contents.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/external_focus_tracker.h" #include "ui/views/focus/view_storage.h" @@ -70,12 +70,12 @@ bool FindBarHost::MaybeForwardKeyEventToWebpage( return false; RenderViewHost* render_view_host = - contents->tab_contents()->GetRenderViewHost(); + contents->web_contents()->GetRenderViewHost(); // Make sure we don't have a text field element interfering with keyboard // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom". render_view_host->ClearFocusedNode(); - NativeWebKeyboardEvent event = GetKeyboardEvent(contents->tab_contents(), + NativeWebKeyboardEvent event = GetKeyboardEvent(contents->web_contents(), key_event); render_view_host->ForwardKeyboardEvent(event); return true; @@ -158,7 +158,7 @@ bool FindBarHost::IsFindBarVisible() { void FindBarHost::RestoreSavedFocus() { if (focus_tracker() == NULL) { // TODO(brettw) Focus() should be on TabContentsView. - find_bar_controller_->tab_contents()->tab_contents()->Focus(); + find_bar_controller_->tab_contents()->web_contents()->Focus(); } else { focus_tracker()->FocusLastFocusedExternalView(); } @@ -325,7 +325,7 @@ void FindBarHost::UnregisterAccelerators() { void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) { gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowScreenBounds(); TabContentsView* tab_view = - find_bar_controller_->tab_contents()->tab_contents()->GetView(); + find_bar_controller_->tab_contents()->web_contents()->GetView(); gfx::Rect webcontents_rect; tab_view->GetViewBounds(&webcontents_rect); avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y()); |