diff options
| author | hanxi <hanxi@chromium.org> | 2015-04-16 12:15:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-16 19:16:06 +0000 |
| commit | 05a02505462f29d067288ec9e5143c2daad5be78 (patch) | |
| tree | 78cae035ea9af5c990a0ab8d7c97c6c4c3ed7404 /extensions/common/user_script.cc | |
| parent | b87cb277526092e101ce29f2ad0393f6247cc39e (diff) | |
| download | chromium_src-05a02505462f29d067288ec9e5143c2daad5be78.zip chromium_src-05a02505462f29d067288ec9e5143c2daad5be78.tar.gz chromium_src-05a02505462f29d067288ec9e5143c2daad5be78.tar.bz2 | |
Implement <webview>.addContentScript/removeContentScript API [1].
This patch includes the changes that enables <webview>.addContentScript/removeContentScript API work on extensions.
This is the first patch in a series of patches:
1) Implement <webview>.addContentScript/removeContentScript API [1] (https://codereview.chromium.org/959413003)
2) Implement <webview>.addContentScript/removeContentScript API [2] (https://codereview.chromium.org/1056533002)
3) Implement <webview>.addContentScript/removeContentScript API [3] (https://codereview.chromium.org/1058113002)
TBR=asvitkine@chromium.org
BUG=461052
Review URL: https://codereview.chromium.org/959413003
Cr-Commit-Position: refs/heads/master@{#325492}
Diffstat (limited to 'extensions/common/user_script.cc')
| -rw-r--r-- | extensions/common/user_script.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/extensions/common/user_script.cc b/extensions/common/user_script.cc index ea7b6a7..825276f 100644 --- a/extensions/common/user_script.cc +++ b/extensions/common/user_script.cc @@ -147,7 +147,6 @@ void UserScript::Pickle(::Pickle* pickle) const { PickleHostID(pickle, host_id_); pickle->WriteInt(consumer_instance_type()); - PickleRoutingInfo(pickle, routing_info_); PickleGlobs(pickle, globs_); PickleGlobs(pickle, exclude_globs_); PickleURLPatternSet(pickle, url_set_); @@ -170,12 +169,6 @@ void UserScript::PickleHostID(::Pickle* pickle, const HostID& host_id) const { pickle->WriteString(host_id.id()); } -void UserScript::PickleRoutingInfo(::Pickle* pickle, - const RoutingInfo& routing_info) const { - pickle->WriteInt(routing_info.render_process_id); - pickle->WriteInt(routing_info.render_view_id); -} - void UserScript::PickleURLPatternSet(::Pickle* pickle, const URLPatternSet& pattern_list) const { pickle->WriteSizeT(pattern_list.patterns().size()); @@ -215,7 +208,6 @@ void UserScript::Unpickle(const ::Pickle& pickle, PickleIterator* iter) { consumer_instance_type_ = static_cast<ConsumerInstanceType>(consumer_instance_type); - UnpickleRoutingInfo(pickle, iter, &routing_info_); UnpickleGlobs(pickle, iter, &globs_); UnpickleGlobs(pickle, iter, &exclude_globs_); UnpickleURLPatternSet(pickle, iter, &url_set_); @@ -246,13 +238,6 @@ void UserScript::UnpickleHostID(const ::Pickle& pickle, *host_id = HostID(static_cast<HostID::HostType>(type), id); } -void UserScript::UnpickleRoutingInfo(const ::Pickle& pickle, - PickleIterator* iter, - RoutingInfo* routing_info) { - CHECK(iter->ReadInt(&routing_info->render_process_id)); - CHECK(iter->ReadInt(&routing_info->render_view_id)); -} - void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle, PickleIterator* iter, URLPatternSet* pattern_list) { |