Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 12052023: Add "frame to navigate" to NavigationEntry and plumb it to the RenderViewImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // We may have been redirected when navigating to the current URL. 237 // We may have been redirected when navigating to the current URL.
238 // Use the URL the user originally intended to visit, if it's valid and if a 238 // Use the URL the user originally intended to visit, if it's valid and if a
239 // POST wasn't involved; the latter case avoids issues with sending data to 239 // POST wasn't involved; the latter case avoids issues with sending data to
240 // the wrong page. 240 // the wrong page.
241 params->url = entry.GetOriginalRequestURL(); 241 params->url = entry.GetOriginalRequestURL();
242 } else { 242 } else {
243 params->url = entry.GetURL(); 243 params->url = entry.GetURL();
244 } 244 }
245 245
246 params->can_load_local_resources = entry.GetCanLoadLocalResources(); 246 params->can_load_local_resources = entry.GetCanLoadLocalResources();
247 params->frame_to_navigate = entry.GetFrameToNavigate();
247 248
248 if (delegate) 249 if (delegate)
249 delegate->AddNavigationHeaders(params->url, &params->extra_headers); 250 delegate->AddNavigationHeaders(params->url, &params->extra_headers);
250 } 251 }
251 252
252 int GetSwitchValueAsInt( 253 int GetSwitchValueAsInt(
253 const CommandLine& command_line, 254 const CommandLine& command_line,
254 const std::string& switch_string, 255 const std::string& switch_string,
255 int min_value) { 256 int min_value) {
256 std::string string_value = command_line.GetSwitchValueASCII(switch_string); 257 std::string string_value = command_line.GetSwitchValueASCII(switch_string);
(...skipping 3173 matching lines...) Expand 10 before | Expand all | Expand 10 after
3430 3431
3431 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3432 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3432 return browser_plugin_guest_.get(); 3433 return browser_plugin_guest_.get();
3433 } 3434 }
3434 3435
3435 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3436 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3436 return browser_plugin_embedder_.get(); 3437 return browser_plugin_embedder_.get();
3437 } 3438 }
3438 3439
3439 } // namespace content 3440 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_entry_impl_unittest.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698