Persist the Instant API to committed search result pages.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 1198 matching lines @@
   TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::ActiveTabChanged");
   if (old_contents && !old_contents->IsBeingDestroyed())
     old_contents->GetView()->StoreFocus();
 
   // Update various elements that are interested in knowing the current
   // WebContents.
   UpdateDevToolsForContents(new_contents);
   InfoBarTabHelper* new_infobar_tab_helper =
       InfoBarTabHelper::FromWebContents(new_contents);
   infobar_container_->ChangeTabContents(new_infobar_tab_helper);
-  contents_container_->SetTab(TabContents::FromWebContents(new_contents));
+  contents_container_->SetTab(new_contents);
 
   // TODO(estade): after we manage browser activation, add a check to make sure
   // we are the active browser before calling RestoreFocus().
   if (!browser_->tab_strip_model()->closing_all()) {
     new_contents->GetView()->RestoreFocus();
     FindTabHelper* find_tab_helper =
         FindTabHelper::FromWebContents(new_contents);
     if (find_tab_helper->find_ui_active())
       browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
   }
@@ skipping 45 matching lines @@
     // This is a views specific call that made its way into the interface. We
     // go through GetXPositionOfLocationIcon() since we need widget relativity.
     *x = 0;
     NOTREACHED();
   }
   return true;
 }
 
 extensions::ActiveTabPermissionGranter*
     BrowserWindowGtk::GetActiveTabPermissionGranter() {
-  TabContents* tab = GetDisplayedTab();
+  WebContents* tab = GetDisplayedTab();
   if (!tab)
     return NULL;
-  return extensions::TabHelper::FromWebContents(tab->web_contents())->
+  return extensions::TabHelper::FromWebContents(tab)->
       active_tab_permission_granter();
 }
 
 void BrowserWindowGtk::DestroyBrowser() {
   browser_.reset();
 }
 
 gboolean BrowserWindowGtk::OnConfigure(GtkWidget* widget,
                                        GdkEventConfigure* event) {
   gfx::Rect bounds(event->x, event->y, event->width, event->height);
 
   // When the window moves, we'll get multiple configure-event signals. We can
   // also get events when the bounds haven't changed, but the window's stacking
   // has, which we aren't interested in. http://crbug.com/70125
   if (bounds == configure_bounds_)
     return FALSE;
 
   GetLocationBar()->GetLocationEntry()->CloseOmniboxPopup();
 
-  TabContents* tab = GetDisplayedTab();
-  if (tab) {
-    tab->web_contents()->GetRenderViewHost()->NotifyMoveOrResizeStarted();
-  }
+  WebContents* tab = GetDisplayedTab();
+  if (tab)
+    tab->GetRenderViewHost()->NotifyMoveOrResizeStarted();
 
   if (bounds_.size() != bounds.size())
     UpdateWindowShape(bounds.width(), bounds.height());
 
   // We update |bounds_| but not |restored_bounds_| here.  The latter needs
   // to be updated conditionally when the window is non-maximized and non-
   // fullscreen, but whether those state updates have been processed yet is
   // window-manager specific.  We update |restored_bounds_| in the debounced
   // handler below, after the window state has been updated.
   bounds_ = bounds;
@@ skipping 181 matching lines @@
   // is the case in Valgrind tests).
   if (ui::XDisplayExists() &&
       !prefs->HasPrefPath(prefs::kUseCustomChromeFrame)) {
     custom_frame_default = GetCustomFramePrefDefault();
   }
   prefs->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
                              custom_frame_default,
                              PrefService::SYNCABLE_PREF);
 }
 
-TabContents* BrowserWindowGtk::GetDisplayedTab() {
+WebContents* BrowserWindowGtk::GetDisplayedTab() {
   return contents_container_->GetVisibleTab();
 }
 
 void BrowserWindowGtk::QueueToolbarRedraw() {
   gtk_widget_queue_draw(toolbar_->widget());
 }
 
 void BrowserWindowGtk::SetGeometryHints() {
   // If we call gtk_window_maximize followed by gtk_window_present, compiz gets
   // confused and maximizes the window, but doesn't set the
@@ skipping 387 matching lines @@
   }
 
   return x;
 }
 
 void BrowserWindowGtk::MaybeShowBookmarkBar(bool animate) {
   TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::MaybeShowBookmarkBar");
   if (!IsBookmarkBarSupported())
     return;
 
-  TabContents* tab = GetDisplayedTab();
-
-  if (tab)
+  if (GetDisplayedTab())
     bookmark_bar_->SetPageNavigator(browser_.get());
 
   BookmarkBar::State state = browser_->bookmark_bar_state();
   if (contents_container_->HasPreview() && state == BookmarkBar::DETACHED)
     state = BookmarkBar::HIDDEN;
 
   toolbar_->UpdateForBookmarkBarVisibility(state == BookmarkBar::DETACHED);
   PlaceBookmarkBar(state == BookmarkBar::DETACHED);
   bookmark_bar_->SetBookmarkBarState(
       state,
@@ skipping 368 matching lines @@
   if (devtools_window_ == new_devtools_window && (!new_devtools_window ||
         new_devtools_window->dock_side() == devtools_dock_side_))
     return;
 
   // Replace tab contents.
   if (devtools_window_ != new_devtools_window) {
     if (devtools_window_) {
       devtools_container_->DetachTab(
           devtools_window_->tab_contents()->web_contents());
     }
-    devtools_container_->SetTab(
-        new_devtools_window ? new_devtools_window->tab_contents() : NULL);
+    devtools_container_->SetTab(new_devtools_window ?
+        new_devtools_window->tab_contents()->web_contents() : NULL);
     if (new_devtools_window) {
       // WebContentsViewGtk::WasShown is not called when tab contents is shown
       // by anything other than user selecting a Tab.
       // See TabContentsViewViews::OnWindowPosChanged for reference on how it
       // should be implemented.
       new_devtools_window->tab_contents()->web_contents()->WasShown();
     }
   }
 
   // Store last used position.
@@ skipping 91 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }