Chromium Code Reviews| Index: extensions/renderer/user_script_set.h |
| diff --git a/extensions/renderer/user_script_set.h b/extensions/renderer/user_script_set.h |
| index e5e91fd418b2158bdfa0852cbcb43467b592da97..597b07766e347b5dc8e1e683b3c485bfad79c70f 100644 |
| --- a/extensions/renderer/user_script_set.h |
| +++ b/extensions/renderer/user_script_set.h |
| @@ -41,7 +41,7 @@ class UserScriptSet { |
| }; |
| explicit UserScriptSet(const ExtensionSet* extensions); |
| - ~UserScriptSet(); |
| + virtual ~UserScriptSet(); |
|
Devlin
2014/08/04 18:33:26
?
Mark Dittmer
2014/08/05 20:33:20
Must have been an error during a merge. Reverted.
|
| // Adds or removes observers. |
| void AddObserver(Observer* observer); |
| @@ -61,8 +61,8 @@ class UserScriptSet { |
| // Updates scripts given the shared memory region containing user scripts. |
| // Returns true if the scripts were successfully updated. |
| - bool UpdateUserScripts(base::SharedMemoryHandle shared_memory, |
| - const std::set<std::string>& changed_extensions); |
| + bool OnUpdateUserScripts(base::SharedMemoryHandle shared_memory, |
|
Devlin
2014/08/04 18:33:26
?
Mark Dittmer
2014/08/05 20:33:20
ditto
|
| + const std::set<std::string>& changed_extensions); |
| const std::vector<UserScript*>& scripts() const { return scripts_.get(); } |