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

Side by Side Diff: extensions/browser/guest_view/extension_view/extension_view_guest.cc

Issue 1909773002: Convert //extensions/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" 5 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h"
9 #include "components/crx_file/id_util.h" 10 #include "components/crx_file/id_util.h"
10 #include "components/guest_view/browser/guest_view_event.h" 11 #include "components/guest_view/browser/guest_view_event.h"
11 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
12 #include "content/public/common/result_codes.h" 13 #include "content/public/common/result_codes.h"
13 #include "extensions/browser/api/extensions_api_client.h" 14 #include "extensions/browser/api/extensions_api_client.h"
14 #include "extensions/browser/bad_message.h" 15 #include "extensions/browser/bad_message.h"
15 #include "extensions/browser/guest_view/extension_view/extension_view_constants. h" 16 #include "extensions/browser/guest_view/extension_view/extension_view_constants. h"
16 #include "extensions/browser/guest_view/extension_view/whitelist/extension_view_ whitelist.h" 17 #include "extensions/browser/guest_view/extension_view/whitelist/extension_view_ whitelist.h"
17 #include "extensions/common/constants.h" 18 #include "extensions/common/constants.h"
18 #include "extensions/common/extension_messages.h" 19 #include "extensions/common/extension_messages.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 119
119 void ExtensionViewGuest::DidCommitProvisionalLoadForFrame( 120 void ExtensionViewGuest::DidCommitProvisionalLoadForFrame(
120 content::RenderFrameHost* render_frame_host, 121 content::RenderFrameHost* render_frame_host,
121 const GURL& url, 122 const GURL& url,
122 ui::PageTransition transition_type) { 123 ui::PageTransition transition_type) {
123 if (render_frame_host->GetParent()) 124 if (render_frame_host->GetParent())
124 return; 125 return;
125 126
126 url_ = url; 127 url_ = url;
127 128
128 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); 129 std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
129 args->SetString(guest_view::kUrl, url_.spec()); 130 args->SetString(guest_view::kUrl, url_.spec());
130 DispatchEventToView(make_scoped_ptr( 131 DispatchEventToView(base::WrapUnique(
131 new GuestViewEvent(extensionview::kEventLoadCommit, std::move(args)))); 132 new GuestViewEvent(extensionview::kEventLoadCommit, std::move(args))));
132 } 133 }
133 134
134 void ExtensionViewGuest::DidNavigateMainFrame( 135 void ExtensionViewGuest::DidNavigateMainFrame(
135 const content::LoadCommittedDetails& details, 136 const content::LoadCommittedDetails& details,
136 const content::FrameNavigateParams& params) { 137 const content::FrameNavigateParams& params) {
137 if (attached() && !url::IsSameOriginWith(params.url, url_)) { 138 if (attached() && !url::IsSameOriginWith(params.url, url_)) {
138 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), 139 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
139 bad_message::EVG_BAD_ORIGIN); 140 bad_message::EVG_BAD_ORIGIN);
140 } 141 }
141 } 142 }
142 143
143 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) { 144 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) {
144 std::string src; 145 std::string src;
145 params.GetString(extensionview::kAttributeSrc, &src); 146 params.GetString(extensionview::kAttributeSrc, &src);
146 NavigateGuest(src, false /* force_navigation */); 147 NavigateGuest(src, false /* force_navigation */);
147 } 148 }
148 149
149 } // namespace extensions 150 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698