InstantExtended: Send search URLs to renderers.

content/renderer/render_view_impl.cc

 // Copyright (c) 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3674 matching lines @@
     pending_navigation_params_->pending_history_list_offset =
         navigation_state->pending_history_list_offset();
     pending_navigation_params_->should_clear_history_list =
         navigation_state->history_list_was_cleared();
     pending_navigation_params_->transition =
         navigation_state->transition_type();
     pending_navigation_params_->request_time =
         document_state->request_time();
   }
 
+  // Allow the embedder to suppress an error page.
+  if (GetContentClient()->renderer()->ShouldSuppressErrorPage(

[Charlie Reis, 2013/09/13 22:33:17]

Please coordinate with lazyboy@ on this, since he's doing almost the same thing
in https://chromiumcodereview.appspot.com/23856006/.

Either way, this should probably go earlier, closer to the ERR_ABORTED return
statement.

[Charlie Reis, 2013/09/13 22:58:09]

I'm not sure I understand your reply.  Which part of the code below line 3654 do
you need?

There's an existing comment about "messing up session history" on line 3667
which makes me wary about changing pending_navigation_params_ without calling
LoadNavigationErrorPage.

[Jered, 2013/09/16 22:30:47]

Sorry, I confused myself, you're right. Moved the code up.

+          error.unreachableURL)) {
+    return;
+  }
+
   // Provide the user with a more helpful error page?
   if (MaybeLoadAlternateErrorPage(frame, error, replace))
     return;
 
   // Fallback to a local error page.
   LoadNavigationErrorPage(frame, failed_request, error, std::string(), replace);
 }
 
 void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame,
                                               bool is_new_navigation) {
@@ skipping 2826 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content