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

Unified Diff: extensions/renderer/user_script_set_manager.cc

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_set_manager.h ('k') | extensions/renderer/v8_schema_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/user_script_set_manager.cc
diff --git a/extensions/renderer/user_script_set_manager.cc b/extensions/renderer/user_script_set_manager.cc
index 0404e0552b9e48bd0725db10f48df9601f6ea14b..23a7eb8ff1d480a3ed8f30272b0a2522c050be96 100644
--- a/extensions/renderer/user_script_set_manager.cc
+++ b/extensions/renderer/user_script_set_manager.cc
@@ -30,7 +30,7 @@ void UserScriptSetManager::RemoveObserver(Observer* observer) {
observers_.RemoveObserver(observer);
}
-scoped_ptr<ScriptInjection>
+std::unique_ptr<ScriptInjection>
UserScriptSetManager::GetInjectionForDeclarativeScript(
int script_id,
content::RenderFrame* render_frame,
@@ -40,7 +40,7 @@ UserScriptSetManager::GetInjectionForDeclarativeScript(
UserScriptSet* user_script_set =
GetProgrammaticScriptsByHostID(HostID(HostID::EXTENSIONS, extension_id));
if (!user_script_set)
- return scoped_ptr<ScriptInjection>();
+ return std::unique_ptr<ScriptInjection>();
return user_script_set->GetDeclarativeScriptInjection(
script_id,
@@ -61,7 +61,7 @@ bool UserScriptSetManager::OnControlMessageReceived(
}
void UserScriptSetManager::GetAllInjections(
- std::vector<scoped_ptr<ScriptInjection>>* injections,
+ std::vector<std::unique_ptr<ScriptInjection>>* injections,
content::RenderFrame* render_frame,
int tab_id,
UserScript::RunLocation run_location) {
« no previous file with comments | « extensions/renderer/user_script_set_manager.h ('k') | extensions/renderer/v8_schema_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698