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

Unified Diff: chrome/browser/background/background_contents_service.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 2 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
Index: chrome/browser/background/background_contents_service.cc
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index d93ec84309d9e76b6696253051959a74b8943011..d5b14d9899f012d277191c0c98e78fa41f05aa8f 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -640,30 +640,26 @@ void BackgroundContentsService::LoadBackgroundContents(
DVLOG(1) << "Loading background content url: " << url;
BackgroundContents* contents = CreateBackgroundContents(
- SiteInstance::CreateForURL(profile, url),
- MSG_ROUTING_NONE,
- MSG_ROUTING_NONE,
- profile,
- frame_name,
- application_id,
- std::string(),
- NULL);
+ SiteInstance::CreateForURL(profile, url), MSG_ROUTING_NONE,
+ MSG_ROUTING_NONE, MSG_ROUTING_NONE, profile, frame_name, application_id,
+ std::string(), NULL);
contents->CreateRenderViewSoon(url);
}
BackgroundContents* BackgroundContentsService::CreateBackgroundContents(
SiteInstance* site,
- int routing_id,
- int main_frame_route_id,
+ int32_t routing_id,
+ int32_t main_frame_route_id,
+ int32_t main_frame_widget_route_id,
Profile* profile,
const std::string& frame_name,
const base::string16& application_id,
const std::string& partition_id,
content::SessionStorageNamespace* session_storage_namespace) {
BackgroundContents* contents = new BackgroundContents(
- site, routing_id, main_frame_route_id, this, partition_id,
- session_storage_namespace);
+ site, routing_id, main_frame_route_id, main_frame_widget_route_id, this,
+ partition_id, session_storage_namespace);
// Register the BackgroundContents internally, then send out a notification
// to external listeners.

Powered by Google App Engine
This is Rietveld 408576698