Allow transitions to WebUI pages which are extension urls (new tab page is the relevant example).

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 <string>
 #include <vector>
@@ skipping 1274 matching lines @@
   if (!webview())
     return;
 
   handling_select_range_ = true;
   webview()->focusedFrame()->selectRange(start, end);
   handling_select_range_ = false;
 }
 
 void RenderViewImpl::OnSetHistoryLengthAndPrune(int history_length,
                                                 int32 minimum_page_id) {
-  DCHECK(history_length >= 0);
+  DCHECK_GE(history_length, 0);
   DCHECK(history_list_offset_ == history_list_length_ - 1);
-  DCHECK(minimum_page_id >= -1);
+  DCHECK_GE(minimum_page_id, -1);
 
   // Generate the new list.
   std::vector<int32> new_history_page_ids(history_length, -1);
   for (size_t i = 0; i < history_page_ids_.size(); ++i) {
     if (minimum_page_id >= 0 && history_page_ids_[i] < minimum_page_id)
       continue;
     new_history_page_ids.push_back(history_page_ids_[i]);
   }
   new_history_page_ids.swap(history_page_ids_);
 
@@ skipping 1476 matching lines @@
     DocumentState* old_document_state =
         DocumentState::FromDataSource(webview()->mainFrame()->dataSource());
     if (old_document_state) {
       document_state->set_is_overriding_user_agent(
           old_document_state->is_overriding_user_agent());
     }
   }
 
   // The rest of RenderView assumes that a WebDataSource will always have a
   // non-null NavigationState.
-  if (content_initiated)
+  if (content_initiated) {
     document_state->set_navigation_state(
         NavigationState::CreateContentInitiated());
-  else {
+  } else {
     document_state->set_navigation_state(CreateNavigationStateFromPending());
     pending_navigation_params_.reset();
   }
 
   // DocumentState::referred_by_prefetcher_ is true if we are
   // navigating from a page that used prefetching using a link on that
   // page.  We are early enough in the request process here that we
   // can still see the DocumentState of the previous page and set
   // this value appropriately.
   // TODO(gavinp): catch the important case of navigation in a new
@@ skipping 113 matching lines @@
     webview()->settings()->setViewportEnabled(true);
   } else if (enable_fixed_layout) {
     std::string str =
         command_line.GetSwitchValueASCII(switches::kEnableFixedLayout);
     std::vector<std::string> tokens;
     base::SplitString(str, ',', &tokens);
     if (tokens.size() == 2) {
       int width, height;
       if (base::StringToInt(tokens[0], &width) &&
           base::StringToInt(tokens[1], &height))
-        webview()->setFixedLayoutSize(WebSize(width,height));
+        webview()->setFixedLayoutSize(WebSize(width, height));
     }
   }
 }
 
 void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
   WebDataSource* ds = frame->provisionalDataSource();
   DocumentState* document_state = DocumentState::FromDataSource(ds);
 
   // Update the request time if WebKit has better knowledge of it.
   if (document_state->request_time().is_null()) {
@@ skipping 359 matching lines @@
                                      WebURLRequest& request,
                                      const WebURLResponse& redirect_response) {
   WebFrame* top_frame = frame->top();
   if (!top_frame)
     top_frame = frame;
   WebDataSource* provisional_data_source = top_frame->provisionalDataSource();
   WebDataSource* top_data_source = top_frame->dataSource();
   WebDataSource* data_source =
       provisional_data_source ? provisional_data_source : top_data_source;
 
-  GURL request_url(request.url());
-  GURL new_url;
-  if (content::GetContentClient()->renderer()->WillSendRequest(
-      frame, request_url, &new_url)) {
-    request.setURL(WebURL(new_url));
-  }
-
   content::PageTransition transition_type = content::PAGE_TRANSITION_LINK;
   DocumentState* document_state = DocumentState::FromDataSource(data_source);
   DCHECK(document_state);
   NavigationState* navigation_state = document_state->navigation_state();
+  transition_type = navigation_state->transition_type();
+
+  GURL request_url(request.url());
+  GURL new_url;
+  if (content::GetContentClient()->renderer()->WillSendRequest(
+      frame, transition_type, request_url, &new_url)) {
+    request.setURL(WebURL(new_url));
+  }
+
   if (document_state->is_cache_policy_override_set())
     request.setCachePolicy(document_state->cache_policy_override());
-  transition_type = navigation_state->transition_type();
 
   WebKit::WebReferrerPolicy referrer_policy;
   if (document_state && document_state->is_referrer_policy_set()) {
     referrer_policy = document_state->referrer_policy();
     document_state->clear_referrer_policy();
   } else {
     referrer_policy = frame->document().referrerPolicy();
   }
 
   // The request's extra data may indicate that we should set a custom user
@@ skipping 1191 matching lines @@
 void RenderViewImpl::OnScriptEvalRequest(const string16& frame_xpath,
                                          const string16& jscript,
                                          int id,
                                          bool notify_result) {
   EvaluateScript(frame_xpath, jscript, id, notify_result);
 }
 
 void RenderViewImpl::OnPostMessageEvent(
     const ViewMsg_PostMessage_Params& params) {
   // TODO(creis): Support sending to subframes.
-  WebFrame *frame = webview()->mainFrame();
+  WebFrame* frame = webview()->mainFrame();
 
   // Find the source frame if it exists.
   // TODO(creis): Support source subframes.
   WebFrame* source_frame = NULL;
   if (params.source_routing_id != MSG_ROUTING_NONE) {
     RenderViewImpl* source_view = FromRoutingID(params.source_routing_id);
     if (source_view)
       source_frame = source_view->webview()->mainFrame();
   }
 
@@ skipping 735 matching lines @@
     for (plugin_it = plugin_delegates_.begin();
          plugin_it != plugin_delegates_.end(); ++plugin_it) {
 #if defined(OS_MACOSX)
       // RenderWidget's call to setFocus can cause the underlying webview's
       // activation state to change just like a call to setIsActive.
       if (enable)
         (*plugin_it)->SetWindowFocus(true);
 #endif
       (*plugin_it)->SetContentAreaFocus(enable);
     }
-
   }
   // Notify all Pepper plugins.
   pepper_delegate_.OnSetFocus(enable);
 }
 
 void RenderViewImpl::PpapiPluginFocusChanged() {
   UpdateTextInputState();
   UpdateSelectionBounds();
 }
 
@@ skipping 452 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }