OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/shell/browser/shell_extensions_browser_client.h" | 5 #include "extensions/shell/browser/shell_extensions_browser_client.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "build/build_config.h" | 10 #include "build/build_config.h" |
10 #include "content/public/browser/browser_context.h" | 11 #include "content/public/browser/browser_context.h" |
11 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
12 #include "content/public/browser/render_frame_host.h" | 13 #include "content/public/browser/render_frame_host.h" |
13 #include "extensions/browser/api/extensions_api_client.h" | 14 #include "extensions/browser/api/extensions_api_client.h" |
14 #include "extensions/browser/api/generated_api_registration.h" | 15 #include "extensions/browser/api/generated_api_registration.h" |
15 #include "extensions/browser/event_router.h" | 16 #include "extensions/browser/event_router.h" |
16 #include "extensions/browser/extension_function_registry.h" | 17 #include "extensions/browser/extension_function_registry.h" |
17 #include "extensions/browser/mojo/service_registration.h" | 18 #include "extensions/browser/mojo/service_registration.h" |
18 #include "extensions/browser/null_app_sorting.h" | 19 #include "extensions/browser/null_app_sorting.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 void ShellExtensionsBrowserClient::GetEarlyExtensionPrefsObservers( | 139 void ShellExtensionsBrowserClient::GetEarlyExtensionPrefsObservers( |
139 content::BrowserContext* context, | 140 content::BrowserContext* context, |
140 std::vector<ExtensionPrefsObserver*>* observers) const { | 141 std::vector<ExtensionPrefsObserver*>* observers) const { |
141 } | 142 } |
142 | 143 |
143 ProcessManagerDelegate* | 144 ProcessManagerDelegate* |
144 ShellExtensionsBrowserClient::GetProcessManagerDelegate() const { | 145 ShellExtensionsBrowserClient::GetProcessManagerDelegate() const { |
145 return NULL; | 146 return NULL; |
146 } | 147 } |
147 | 148 |
148 scoped_ptr<ExtensionHostDelegate> | 149 std::unique_ptr<ExtensionHostDelegate> |
149 ShellExtensionsBrowserClient::CreateExtensionHostDelegate() { | 150 ShellExtensionsBrowserClient::CreateExtensionHostDelegate() { |
150 return scoped_ptr<ExtensionHostDelegate>(new ShellExtensionHostDelegate); | 151 return base::WrapUnique(new ShellExtensionHostDelegate); |
151 } | 152 } |
152 | 153 |
153 bool ShellExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) { | 154 bool ShellExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) { |
154 // TODO(jamescook): We might want to tell extensions when app_shell updates. | 155 // TODO(jamescook): We might want to tell extensions when app_shell updates. |
155 return false; | 156 return false; |
156 } | 157 } |
157 | 158 |
158 void ShellExtensionsBrowserClient::PermitExternalProtocolHandler() { | 159 void ShellExtensionsBrowserClient::PermitExternalProtocolHandler() { |
159 } | 160 } |
160 | 161 |
(...skipping 24 matching lines...) Expand all Loading... |
185 // app_shell-only APIs. | 186 // app_shell-only APIs. |
186 shell::api::ShellGeneratedFunctionRegistry::RegisterAll(registry); | 187 shell::api::ShellGeneratedFunctionRegistry::RegisterAll(registry); |
187 } | 188 } |
188 | 189 |
189 void ShellExtensionsBrowserClient::RegisterMojoServices( | 190 void ShellExtensionsBrowserClient::RegisterMojoServices( |
190 content::RenderFrameHost* render_frame_host, | 191 content::RenderFrameHost* render_frame_host, |
191 const Extension* extension) const { | 192 const Extension* extension) const { |
192 RegisterServicesForFrame(render_frame_host, extension); | 193 RegisterServicesForFrame(render_frame_host, extension); |
193 } | 194 } |
194 | 195 |
195 scoped_ptr<RuntimeAPIDelegate> | 196 std::unique_ptr<RuntimeAPIDelegate> |
196 ShellExtensionsBrowserClient::CreateRuntimeAPIDelegate( | 197 ShellExtensionsBrowserClient::CreateRuntimeAPIDelegate( |
197 content::BrowserContext* context) const { | 198 content::BrowserContext* context) const { |
198 return scoped_ptr<RuntimeAPIDelegate>(new ShellRuntimeAPIDelegate()); | 199 return base::WrapUnique(new ShellRuntimeAPIDelegate()); |
199 } | 200 } |
200 | 201 |
201 const ComponentExtensionResourceManager* | 202 const ComponentExtensionResourceManager* |
202 ShellExtensionsBrowserClient::GetComponentExtensionResourceManager() { | 203 ShellExtensionsBrowserClient::GetComponentExtensionResourceManager() { |
203 return NULL; | 204 return NULL; |
204 } | 205 } |
205 | 206 |
206 void ShellExtensionsBrowserClient::BroadcastEventToRenderers( | 207 void ShellExtensionsBrowserClient::BroadcastEventToRenderers( |
207 events::HistogramValue histogram_value, | 208 events::HistogramValue histogram_value, |
208 const std::string& event_name, | 209 const std::string& event_name, |
209 scoped_ptr<base::ListValue> args) { | 210 std::unique_ptr<base::ListValue> args) { |
210 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { | 211 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
211 BrowserThread::PostTask( | 212 BrowserThread::PostTask( |
212 BrowserThread::UI, FROM_HERE, | 213 BrowserThread::UI, FROM_HERE, |
213 base::Bind(&ShellExtensionsBrowserClient::BroadcastEventToRenderers, | 214 base::Bind(&ShellExtensionsBrowserClient::BroadcastEventToRenderers, |
214 base::Unretained(this), histogram_value, event_name, | 215 base::Unretained(this), histogram_value, event_name, |
215 base::Passed(&args))); | 216 base::Passed(&args))); |
216 return; | 217 return; |
217 } | 218 } |
218 | 219 |
219 scoped_ptr<Event> event( | 220 std::unique_ptr<Event> event( |
220 new Event(histogram_value, event_name, std::move(args))); | 221 new Event(histogram_value, event_name, std::move(args))); |
221 EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event)); | 222 EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event)); |
222 } | 223 } |
223 | 224 |
224 net::NetLog* ShellExtensionsBrowserClient::GetNetLog() { | 225 net::NetLog* ShellExtensionsBrowserClient::GetNetLog() { |
225 return NULL; | 226 return NULL; |
226 } | 227 } |
227 | 228 |
228 ExtensionCache* ShellExtensionsBrowserClient::GetExtensionCache() { | 229 ExtensionCache* ShellExtensionsBrowserClient::GetExtensionCache() { |
229 return extension_cache_.get(); | 230 return extension_cache_.get(); |
(...skipping 13 matching lines...) Expand all Loading... |
243 api_client_.reset(api_client); | 244 api_client_.reset(api_client); |
244 } | 245 } |
245 | 246 |
246 ExtensionWebContentsObserver* | 247 ExtensionWebContentsObserver* |
247 ShellExtensionsBrowserClient::GetExtensionWebContentsObserver( | 248 ShellExtensionsBrowserClient::GetExtensionWebContentsObserver( |
248 content::WebContents* web_contents) { | 249 content::WebContents* web_contents) { |
249 return ShellExtensionWebContentsObserver::FromWebContents(web_contents); | 250 return ShellExtensionWebContentsObserver::FromWebContents(web_contents); |
250 } | 251 } |
251 | 252 |
252 } // namespace extensions | 253 } // namespace extensions |
OLD | NEW |