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

Unified Diff: chrome/browser/chromeos/first_run/drive_first_run_controller.cc

Issue 790423002: Add the main frame routing ID to WebContentsDelegate, use it in BackgroundContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content shell Created 6 years 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
Index: chrome/browser/chromeos/first_run/drive_first_run_controller.cc
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
index af3e7f71b6bf9c7caa555feb4d3ac96676071927..c071d48da394a2089229468c307e73624096af88 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
@@ -163,6 +163,7 @@ class DriveWebContentsManager : public content::WebContentsObserver,
virtual bool ShouldCreateWebContents(
content::WebContents* web_contents,
int route_id,
+ int main_frame_route_id,
WindowContainerType window_container_type,
const base::string16& frame_name,
const GURL& target_url,
@@ -276,6 +277,7 @@ void DriveWebContentsManager::DidFailLoad(
bool DriveWebContentsManager::ShouldCreateWebContents(
content::WebContents* web_contents,
int route_id,
+ int main_frame_route_id,
WindowContainerType window_container_type,
const base::string16& frame_name,
const GURL& target_url,
@@ -305,6 +307,7 @@ bool DriveWebContentsManager::ShouldCreateWebContents(
BackgroundContents* contents = background_contents_service
->CreateBackgroundContents(content::SiteInstance::Create(profile_),
route_id,
+ main_frame_route_id,
profile_,
frame_name,
base::ASCIIToUTF16(app_id_),
« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698