summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/ui/touch/frame/touch_browser_frame_view.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index 491e162..946b7ca 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -247,8 +247,10 @@ void TouchBrowserFrameView::Observe(NotificationType type,
GetFocusedStateAccessor()->SetProperty(
source_tab->property_bag(), editable);
} else if (type == NotificationType::NAV_ENTRY_COMMITTED) {
+ NavigationController* controller =
+ Source<NavigationController>(source).ptr();
Browser* source_browser = Browser::GetBrowserForController(
- Source<NavigationController>(source).ptr(), NULL);
+ controller, NULL);
// If the Browser for the keyboard has navigated, re-evaluate the visibility
// of the keyboard.
@@ -260,7 +262,7 @@ void TouchBrowserFrameView::Observe(NotificationType type,
if (view->GetClassName() == RenderWidgetHostViewViews::kViewClassName) {
// Reset the state of the focused field in the current tab.
GetFocusedStateAccessor()->SetProperty(
- source_browser->GetSelectedTabContents()->property_bag(), false);
+ controller->tab_contents()->property_bag(), false);
}
}
if (source_browser == browser)