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

Unified Diff: content/shell/shell.cc

Issue 12296007: [content shell] hook up navigation related WebTestDelegate methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/shell.h ('k') | content/shell/shell_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell.cc
diff --git a/content/shell/shell.cc b/content/shell/shell.cc
index 0e94316ce9c5b30e5009a970ad7bd600e8ab4429..fe65fc1c82572290668f44ebe66c0f66712a4bdc 100644
--- a/content/shell/shell.cc
+++ b/content/shell/shell.cc
@@ -147,12 +147,15 @@ Shell* Shell::CreateNewWindow(BrowserContext* browser_context,
}
void Shell::LoadURL(const GURL& url) {
- web_contents_->GetController().LoadURL(
- url,
- Referrer(),
- PageTransitionFromInt(PAGE_TRANSITION_TYPED |
- PAGE_TRANSITION_FROM_ADDRESS_BAR),
- std::string());
+ LoadURLForFrame(url, std::string());
+}
+
+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_->Focus();
}
« no previous file with comments | « content/shell/shell.h ('k') | content/shell/shell_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698