Update ownership semantics for WebContentsDelegate::AddWebContents.
This CL is a refactor and has no intended behavior change.
This CL updates AddWebContents to use explicit ownership semantics. This CL
fixes some of the subclasses to have proper ownership semantics, and leaves
behind some TODOs for other subclasses.
Bug: 832879, 674318
Change-Id: I6294e591e9166dfb0c029eb78648c17216075dab
TBR: [email protected], [email protected], [email protected]
Reviewed-on: https://chromium-review.googlesource.com/1028631
Reviewed-by: Richard Coles <[email protected]>
Reviewed-by: Antoine Labour <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Commit-Queue: Erik Chen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#554450}diff --git a/extensions/browser/app_window/app_delegate.h b/extensions/browser/app_window/app_delegate.h
index a513cba..30c8fb38 100644
--- a/extensions/browser/app_window/app_delegate.h
+++ b/extensions/browser/app_window/app_delegate.h
@@ -48,11 +48,12 @@
content::BrowserContext* context,
content::WebContents* source,
const content::OpenURLParams& params) = 0;
- virtual void AddNewContents(content::BrowserContext* context,
- content::WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_rect,
- bool user_gesture) = 0;
+ virtual void AddNewContents(
+ content::BrowserContext* context,
+ std::unique_ptr<content::WebContents> new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_rect,
+ bool user_gesture) = 0;
// Feature support.
virtual content::ColorChooser* ShowColorChooser(
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 5b090151..e377ba4 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -366,14 +366,14 @@
}
void AppWindow::AddNewContents(WebContents* source,
- WebContents* new_contents,
+ std::unique_ptr<WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
bool* was_blocked) {
DCHECK(new_contents->GetBrowserContext() == browser_context_);
- app_delegate_->AddNewContents(browser_context_, new_contents, disposition,
- initial_rect, user_gesture);
+ app_delegate_->AddNewContents(browser_context_, std::move(new_contents),
+ disposition, initial_rect, user_gesture);
}
content::KeyboardEventProcessingResult AppWindow::PreHandleKeyboardEvent(
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index 84026c0..e753f89 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -425,7 +425,7 @@
content::WebContents* source,
const content::OpenURLParams& params) override;
void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
+ std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
index 1ef809a..0a8a8f1 100644
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -389,7 +389,7 @@
}
void ExtensionHost::AddNewContents(WebContents* source,
- WebContents* new_contents,
+ std::unique_ptr<WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
@@ -409,18 +409,16 @@
new_contents->GetBrowserContext()) {
WebContentsDelegate* delegate = associated_contents->GetDelegate();
if (delegate) {
- delegate->AddNewContents(
- associated_contents, new_contents, disposition, initial_rect,
- user_gesture, was_blocked);
+ delegate->AddNewContents(associated_contents, std::move(new_contents),
+ disposition, initial_rect, user_gesture,
+ was_blocked);
return;
}
}
}
- // TODO(erikchen): Refactor AddNewContents to take strong ownership semantics.
- // https://crbug.com/832879.
- delegate_->CreateTab(base::WrapUnique(new_contents), extension_id_,
- disposition, initial_rect, user_gesture);
+ delegate_->CreateTab(std::move(new_contents), extension_id_, disposition,
+ initial_rect, user_gesture);
}
void ExtensionHost::RenderViewReady() {
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index c93e3a4..8c7a96fd 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -113,7 +113,7 @@
content::JavaScriptDialogManager* GetJavaScriptDialogManager(
content::WebContents* source) override;
void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
+ std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
index 1a74872..8ad547f 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
@@ -152,17 +152,18 @@
options.ToValue()));
}
-void ExtensionOptionsGuest::AddNewContents(WebContents* source,
- WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_rect,
- bool user_gesture,
- bool* was_blocked) {
+void ExtensionOptionsGuest::AddNewContents(
+ WebContents* source,
+ std::unique_ptr<WebContents> new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_rect,
+ bool user_gesture,
+ bool* was_blocked) {
if (!attached() || !embedder_web_contents()->GetDelegate())
return;
embedder_web_contents()->GetDelegate()->AddNewContents(
- source, new_contents, disposition, initial_rect, user_gesture,
+ source, std::move(new_contents), disposition, initial_rect, user_gesture,
was_blocked);
}
diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.h b/extensions/browser/guest_view/extension_options/extension_options_guest.h
index 12250fc1..9ff1ba65b 100644
--- a/extensions/browser/guest_view/extension_options/extension_options_guest.h
+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.h
@@ -39,7 +39,7 @@
// content::WebContentsDelegate implementation.
void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
+ std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index d0561f07..d9880065 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -1245,17 +1245,17 @@
}
void WebViewGuest::AddNewContents(WebContents* source,
- WebContents* new_contents,
+ std::unique_ptr<WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
bool* was_blocked) {
+ // TODO(erikchen): Fix ownership semantics for WebContents inside this class.
+ // https://crbug.com/832879.
if (was_blocked)
*was_blocked = false;
- RequestNewWindowPermission(disposition,
- initial_rect,
- user_gesture,
- new_contents);
+ RequestNewWindowPermission(disposition, initial_rect, user_gesture,
+ new_contents.release());
}
WebContents* WebViewGuest::OpenURLFromTab(
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.h b/extensions/browser/guest_view/web_view/web_view_guest.h
index 5c06f378..4d6730dd 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest.h
@@ -232,7 +232,7 @@
content::JavaScriptDialogManager* GetJavaScriptDialogManager(
content::WebContents* source) final;
void AddNewContents(content::WebContents* source,
- content::WebContents* new_contents,
+ std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
diff --git a/extensions/shell/browser/shell_app_delegate.cc b/extensions/shell/browser/shell_app_delegate.cc
index 8d9afef1..ee1cf108 100644
--- a/extensions/shell/browser/shell_app_delegate.cc
+++ b/extensions/shell/browser/shell_app_delegate.cc
@@ -41,11 +41,12 @@
return NULL;
}
-void ShellAppDelegate::AddNewContents(content::BrowserContext* context,
- content::WebContents* new_contents,
- WindowOpenDisposition disposition,
- const gfx::Rect& initial_rect,
- bool user_gesture) {
+void ShellAppDelegate::AddNewContents(
+ content::BrowserContext* context,
+ std::unique_ptr<content::WebContents> new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_rect,
+ bool user_gesture) {
NOTIMPLEMENTED();
}
diff --git a/extensions/shell/browser/shell_app_delegate.h b/extensions/shell/browser/shell_app_delegate.h
index c07400ae..79cc6615 100644
--- a/extensions/shell/browser/shell_app_delegate.h
+++ b/extensions/shell/browser/shell_app_delegate.h
@@ -28,7 +28,7 @@
content::WebContents* source,
const content::OpenURLParams& params) override;
void AddNewContents(content::BrowserContext* context,
- content::WebContents* new_contents,
+ std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture) override;
