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

Unified Diff: chrome/browser/ui/browser.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/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c05b4c73269aab5004b623ed59f7d6d927a207ad..0ffa4ce2d05ea473b579335beb102fae7c324f57 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1656,8 +1656,9 @@ void Browser::ShowRepostFormWarningDialog(WebContents* source) {
bool Browser::ShouldCreateWebContents(
WebContents* web_contents,
- int route_id,
- int main_frame_route_id,
+ int32_t route_id,
+ int32_t main_frame_route_id,
+ int32_t main_frame_widget_route_id,
WindowContainerType window_container_type,
const std::string& frame_name,
const GURL& target_url,
@@ -1665,13 +1666,9 @@ bool Browser::ShouldCreateWebContents(
content::SessionStorageNamespace* session_storage_namespace) {
if (window_container_type == WINDOW_CONTAINER_TYPE_BACKGROUND) {
// If a BackgroundContents is created, suppress the normal WebContents.
- return !MaybeCreateBackgroundContents(route_id,
- main_frame_route_id,
- web_contents,
- frame_name,
- target_url,
- partition_id,
- session_storage_namespace);
+ return !MaybeCreateBackgroundContents(
+ route_id, main_frame_route_id, main_frame_widget_route_id, web_contents,
+ frame_name, target_url, partition_id, session_storage_namespace);
}
return true;
@@ -2620,8 +2617,9 @@ bool Browser::ShouldStartShutdown() const {
}
bool Browser::MaybeCreateBackgroundContents(
- int route_id,
- int main_frame_route_id,
+ int32_t route_id,
+ int32_t main_frame_route_id,
+ int32_t main_frame_widget_route_id,
WebContents* opener_web_contents,
const std::string& frame_name,
const GURL& target_url,
@@ -2684,15 +2682,11 @@ bool Browser::MaybeCreateBackgroundContents(
content::SiteInstance::Create(opener_web_contents->GetBrowserContext());
// Passed all the checks, so this should be created as a BackgroundContents.
- BackgroundContents* contents =
- service->CreateBackgroundContents(site_instance.get(),
- route_id,
- main_frame_route_id,
- profile_,
- frame_name,
- base::ASCIIToUTF16(extension->id()),
- partition_id,
- session_storage_namespace);
+ BackgroundContents* contents = service->CreateBackgroundContents(
+ site_instance.get(), route_id, main_frame_route_id,
+ main_frame_widget_route_id, profile_, frame_name,
+ base::ASCIIToUTF16(extension->id()), partition_id,
+ session_storage_namespace);
// When a separate process is used, the original renderer cannot access the
// new window later, thus we need to navigate the window now.

Powered by Google App Engine
This is Rietveld 408576698