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

Unified Diff: extensions/renderer/user_script_set.h

Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/renderer/user_script_injector.cc ('k') | extensions/renderer/user_script_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/user_script_set.h
diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h
index 3ae7e1ff98835dab842727b4b1584838a241a9d4..53800d3532868f9e2852c5a75ddfecc8410fd40d 100644
--- a/extensions/renderer/user_script_set.h
+++ b/extensions/renderer/user_script_set.h
@@ -5,12 +5,12 @@
#ifndef EXTENSIONS_RENDERER_USER_SCRIPT_SET_H_
#define EXTENSIONS_RENDERER_USER_SCRIPT_SET_H_
+#include <memory>
#include <set>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/shared_memory.h"
#include "base/observer_list.h"
@@ -51,12 +51,12 @@ class UserScriptSet {
// |tab_id|, at the given |run_location|, to |injections|.
// |extensions| is passed in to verify the corresponding extension is still
// valid.
- void GetInjections(std::vector<scoped_ptr<ScriptInjection>>* injections,
+ void GetInjections(std::vector<std::unique_ptr<ScriptInjection>>* injections,
content::RenderFrame* render_frame,
int tab_id,
UserScript::RunLocation run_location);
- scoped_ptr<ScriptInjection> GetDeclarativeScriptInjection(
+ std::unique_ptr<ScriptInjection> GetDeclarativeScriptInjection(
int script_id,
content::RenderFrame* render_frame,
int tab_id,
@@ -74,7 +74,7 @@ class UserScriptSet {
private:
// Returns a new ScriptInjection for the given |script| to execute in the
// |render_frame|, or NULL if the script should not execute.
- scoped_ptr<ScriptInjection> GetInjectionForScript(
+ std::unique_ptr<ScriptInjection> GetInjectionForScript(
const UserScript* script,
content::RenderFrame* render_frame,
int tab_id,
@@ -83,7 +83,7 @@ class UserScriptSet {
bool is_declarative);
// Shared memory containing raw script data.
- scoped_ptr<base::SharedMemory> shared_memory_;
+ std::unique_ptr<base::SharedMemory> shared_memory_;
// The UserScripts this injector manages.
ScopedVector<UserScript> scripts_;
« no previous file with comments | « extensions/renderer/user_script_injector.cc ('k') | extensions/renderer/user_script_set.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698