Commit instant loader when the instant page navigates away from instant URL.

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
@@ skipping 52 matching lines @@
   virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
   virtual bool CanDownload(content::RenderViewHost* render_view_host,
                            int request_id,
                            const std::string& request_method) OVERRIDE;
   virtual void HandleMouseDown() OVERRIDE;
   virtual void HandleMouseUp() OVERRIDE;
   virtual void HandlePointerActivate() OVERRIDE;
   virtual void HandleGestureEnd() OVERRIDE;
   virtual void DragEnded() OVERRIDE;
   virtual bool OnGoToEntryOffset(int offset) OVERRIDE;
+  virtual content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) OVERRIDE;
 
   void MaybeCommitFromPointerRelease();
 
   InstantLoader* const loader_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateImpl);
 };
 
 InstantLoader::WebContentsDelegateImpl::WebContentsDelegateImpl(
     InstantLoader* loader)
@@ skipping 65 matching lines @@
   // If the user drags, we won't get a mouse up (at least on Linux). Commit the
   // Instant result when the drag ends, so that during the drag the page won't
   // move around.
   MaybeCommitFromPointerRelease();
 }
 
 bool InstantLoader::WebContentsDelegateImpl::OnGoToEntryOffset(int offset) {
   return false;
 }
 
+content::WebContents* InstantLoader::WebContentsDelegateImpl::OpenURLFromTab(
+    content::WebContents* source,
+    const content::OpenURLParams& params) {
+  content::WebContents* preview = loader_->contents_.get();
+  if (loader_->controller_->CommitIfCurrent(INSTANT_COMMIT_NAVIGATED))

[sky, 2012/12/10 14:47:30]

Style guide says you want one of the following here:

  if (a)
    return b;
  return c;

or:
  return a ? b : c;

[Shishir, 2012/12/10 18:35:52]

Done.

+    return preview->GetDelegate()->OpenURLFromTab(source, params);
+  else
+    return NULL;
+}
+
 void InstantLoader::WebContentsDelegateImpl::MaybeCommitFromPointerRelease() {
   if (loader_->is_pointer_down_from_activate_) {
     loader_->is_pointer_down_from_activate_ = false;
     loader_->controller_->CommitIfCurrent(INSTANT_COMMIT_FOCUS_LOST);
   }
 }
 
 // InstantLoader ---------------------------------------------------------------
 
 // static
@@ skipping 120 matching lines @@
 void InstantLoader::StopCapturingKeyStrokes() {
   InstantSupportDetermined(true);
   // NOTE(samarth): the current implementation of the key capturing (invisible
   // focus) doesn't require doing anything explicitly here.
 }
 
 void InstantLoader::RenderViewGone() {
   controller_->InstantLoaderRenderViewGone();
 }
 
+void InstantLoader::AboutToNavigateMainFrame(const GURL& url) {
+  controller_->InstantLoaderAboutToNavigateMainFrame(url);
+}
+
 void InstantLoader::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
 #if defined(OS_MACOSX)
   if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
     if (content::RenderWidgetHostView* rwhv =
             contents_->GetRenderWidgetHostView())
       rwhv->SetTakesFocusOnlyOnMouseDown(true);
     return;
   }
@@ skipping 71 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the WebContents.
   ignore_result(contents_.release());
   contents_.reset(new_contents);
   SetupPreviewContents();
   controller_->SwappedWebContents();
 }