Set the original url correctly if the frame is loaded via loadData

content/shell/browser/shell.cc

 // Copyright 2013 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/shell/browser/shell.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 161 matching lines @@
 
 void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) {
   NavigationController::LoadURLParams params(url);
   params.transition_type = PageTransitionFromInt(
       PAGE_TRANSITION_TYPED | PAGE_TRANSITION_FROM_ADDRESS_BAR);
   params.frame_name = frame_name;
   web_contents_->GetController().LoadURLWithParams(params);
   web_contents_->GetView()->Focus();
 }
 
+void Shell::LoadDataWithBaseURL(const GURL& base_url, const std::string& data,

[darin (slow to review), 2014/03/27 08:10:28]

nit: since this method is named LoadDataWithBaseURL, it might be helpful to list
the base_url parameter after the data to better match the order in which those
items are mentioned in the method name.

Also, since history_url is sort of similar to the url parameter to
LoadURLForFrame, you might consider listing it first and just call it |url|.

void Shell::LoadDataWithBaseURL(const GURL& url, const std::string& data, const
GURL& base_url);

[hush (inactive), 2014/03/27 20:15:00]

Done.

+    const GURL& history_url) {
+  const GURL url = GURL("data:text/html;charset=utf-8," + data);
+  NavigationController::LoadURLParams params(url);
+  params.load_type = NavigationController::LOAD_TYPE_DATA;
+  params.base_url_for_data_url = base_url;
+  params.virtual_url_for_data_url = history_url;
+  params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE;
+  web_contents_->GetController().LoadURLWithParams(params);
+  web_contents_->GetView()->Focus();
+}

[darin (slow to review), 2014/03/27 08:10:28]

nit: add a new line below here.

[hush (inactive), 2014/03/27 20:15:00]

Done.

 void Shell::AddNewContents(WebContents* source,
                            WebContents* new_contents,
                            WindowOpenDisposition disposition,
                            const gfx::Rect& initial_pos,
                            bool user_gesture,
                            bool* was_blocked) {
   CreateShell(new_contents, AdjustWindowSize(initial_pos.size()));
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     NotifyDoneForwarder::CreateForWebContents(new_contents);
 }
@@ skipping 181 matching lines @@
   devtools_frontend_->Activate();
   devtools_frontend_->Focus();
 }
 
 void Shell::OnDevToolsWebContentsDestroyed() {
   devtools_observer_.reset();
   devtools_frontend_ = NULL;
 }
 
 }  // namespace content