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

Side by Side Diff: chrome/renderer/extensions/chrome_extensions_renderer_client.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 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 "chrome/renderer/extensions/chrome_extensions_renderer_client.h" 5 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
6 6
7 #include <utility>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
9 #include "chrome/common/chrome_isolated_world_ids.h" 11 #include "chrome/common/chrome_isolated_world_ids.h"
10 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/extensions/extension_constants.h" 13 #include "chrome/common/extensions/extension_constants.h"
12 #include "chrome/common/extensions/extension_metrics.h" 14 #include "chrome/common/extensions/extension_metrics.h"
13 #include "chrome/common/extensions/extension_process_policy.h" 15 #include "chrome/common/extensions/extension_process_policy.h"
14 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
15 #include "chrome/renderer/chrome_render_process_observer.h" 17 #include "chrome/renderer/chrome_render_process_observer.h"
16 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 18 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 frame)) { 222 frame)) {
221 *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL); 223 *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL);
222 return true; 224 return true;
223 } 225 }
224 226
225 return false; 227 return false;
226 } 228 }
227 229
228 void ChromeExtensionsRendererClient::SetExtensionDispatcherForTest( 230 void ChromeExtensionsRendererClient::SetExtensionDispatcherForTest(
229 scoped_ptr<extensions::Dispatcher> extension_dispatcher) { 231 scoped_ptr<extensions::Dispatcher> extension_dispatcher) {
230 extension_dispatcher_ = extension_dispatcher.Pass(); 232 extension_dispatcher_ = std::move(extension_dispatcher);
231 permissions_policy_delegate_.reset( 233 permissions_policy_delegate_.reset(
232 new extensions::RendererPermissionsPolicyDelegate( 234 new extensions::RendererPermissionsPolicyDelegate(
233 extension_dispatcher_.get())); 235 extension_dispatcher_.get()));
234 content::RenderThread::Get()->RegisterExtension( 236 content::RenderThread::Get()->RegisterExtension(
235 extensions::SafeBuiltins::CreateV8Extension()); 237 extensions::SafeBuiltins::CreateV8Extension());
236 } 238 }
237 239
238 extensions::Dispatcher* 240 extensions::Dispatcher*
239 ChromeExtensionsRendererClient::GetExtensionDispatcherForTest() { 241 ChromeExtensionsRendererClient::GetExtensionDispatcherForTest() {
240 return extension_dispatcher(); 242 return extension_dispatcher();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 content::BrowserPluginDelegate* 296 content::BrowserPluginDelegate*
295 ChromeExtensionsRendererClient::CreateBrowserPluginDelegate( 297 ChromeExtensionsRendererClient::CreateBrowserPluginDelegate(
296 content::RenderFrame* render_frame, 298 content::RenderFrame* render_frame,
297 const std::string& mime_type, 299 const std::string& mime_type,
298 const GURL& original_url) { 300 const GURL& original_url) {
299 if (mime_type == content::kBrowserPluginMimeType) 301 if (mime_type == content::kBrowserPluginMimeType)
300 return new extensions::ExtensionsGuestViewContainer(render_frame); 302 return new extensions::ExtensionsGuestViewContainer(render_frame);
301 return new extensions::MimeHandlerViewContainer(render_frame, mime_type, 303 return new extensions::MimeHandlerViewContainer(render_frame, mime_type,
302 original_url); 304 original_url);
303 } 305 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698