| Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc
|
| 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 3b40a5dac1aa375783686f7606a670f20d7c3572..cfdb5cf8de6529416ea75b177e6316daa3dc6fee 100644
|
| --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
|
| +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
|
| @@ -38,20 +38,17 @@ namespace extensions {
|
| // static
|
| const char ExtensionOptionsGuest::Type[] = "extensionoptions";
|
|
|
| -ExtensionOptionsGuest::ExtensionOptionsGuest(
|
| - content::WebContents* owner_web_contents)
|
| +ExtensionOptionsGuest::ExtensionOptionsGuest(WebContents* owner_web_contents)
|
| : GuestView<ExtensionOptionsGuest>(owner_web_contents),
|
| extension_options_guest_delegate_(
|
| extensions::ExtensionsAPIClient::Get()
|
| - ->CreateExtensionOptionsGuestDelegate(this)) {
|
| -}
|
| + ->CreateExtensionOptionsGuestDelegate(this)) {}
|
|
|
| ExtensionOptionsGuest::~ExtensionOptionsGuest() {
|
| }
|
|
|
| // static
|
| -GuestViewBase* ExtensionOptionsGuest::Create(
|
| - content::WebContents* owner_web_contents) {
|
| +GuestViewBase* ExtensionOptionsGuest::Create(WebContents* owner_web_contents) {
|
| return new ExtensionOptionsGuest(owner_web_contents);
|
| }
|
|
|
| @@ -155,8 +152,8 @@ bool ExtensionOptionsGuest::ShouldHandleFindRequestsForEmbedder() const {
|
| return true;
|
| }
|
|
|
| -content::WebContents* ExtensionOptionsGuest::OpenURLFromTab(
|
| - content::WebContents* source,
|
| +WebContents* ExtensionOptionsGuest::OpenURLFromTab(
|
| + WebContents* source,
|
| const content::OpenURLParams& params) {
|
| if (!extension_options_guest_delegate_)
|
| return nullptr;
|
| @@ -177,7 +174,7 @@ content::WebContents* ExtensionOptionsGuest::OpenURLFromTab(
|
| return extension_options_guest_delegate_->OpenURLInNewTab(params);
|
| }
|
|
|
| -void ExtensionOptionsGuest::CloseContents(content::WebContents* source) {
|
| +void ExtensionOptionsGuest::CloseContents(WebContents* source) {
|
| DispatchEventToView(
|
| new GuestViewEvent(extension_options_internal::OnClose::kEventName,
|
| make_scoped_ptr(new base::DictionaryValue())));
|
| @@ -192,7 +189,7 @@ bool ExtensionOptionsGuest::HandleContextMenu(
|
| }
|
|
|
| bool ExtensionOptionsGuest::ShouldCreateWebContents(
|
| - content::WebContents* web_contents,
|
| + WebContents* web_contents,
|
| int route_id,
|
| int main_frame_route_id,
|
| WindowContainerType window_container_type,
|
|
|