Fix View Frame Source for iframe of a file:// URL shows main frame's filename

chrome/browser/ui/browser_commands.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/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 1216 matching lines @@
   DCHECK(view_source_contents->GetController().CanPruneAllButLastCommitted());
   view_source_contents->GetController().PruneAllButLastCommitted();
   NavigationEntry* last_committed_entry =
       view_source_contents->GetController().GetLastCommittedEntry();
   if (!last_committed_entry)
     return;
 
   GURL view_source_url =
       GURL(content::kViewSourceScheme + std::string(":") + url.spec());
   last_committed_entry->SetVirtualURL(view_source_url);
+  last_committed_entry->SetURL(GURL());

[Charlie Reis, 2016/11/23 23:52:20]

Maybe it would make more sense to set this to |url| instead?  If I understand
correctly, it's set to the main frame's URL, but we end up loading the subframe
|url|.  That seems like a closer match to what's happening in practice, and
would avoid the file:// bug in this case.

[afakhry, 2016/11/24 01:21:09]

Thanks for the suggestion! It works.
Done.

 
   // Do not restore scroller position.
   last_committed_entry->SetPageState(page_state.RemoveScrollOffset());
 
   // Do not restore title, derive it from the url.
   view_source_contents->UpdateTitleForEntry(last_committed_entry,
                                             base::string16());
 
   // Now show view-source entry.
   if (browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
@@ skipping 82 matching lines @@
       app_name, true /* trusted_source */, gfx::Rect(), browser->profile()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
 }  // namespace chrome