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

Side by Side Diff: extensions/renderer/user_script_injector.h

Issue 2213603002: Prevent duplicate content script injection defined in manifest.json (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initial fix to bug 631247 Created 4 years, 4 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 #ifndef EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_ 5 #ifndef EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_
6 #define EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_ 6 #define EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 private: 34 private:
35 // UserScriptSet::Observer implementation. 35 // UserScriptSet::Observer implementation.
36 void OnUserScriptsUpdated(const std::set<HostID>& changed_hosts, 36 void OnUserScriptsUpdated(const std::set<HostID>& changed_hosts,
37 const std::vector<UserScript*>& scripts) override; 37 const std::vector<UserScript*>& scripts) override;
38 38
39 // ScriptInjector implementation. 39 // ScriptInjector implementation.
40 UserScript::InjectionType script_type() const override; 40 UserScript::InjectionType script_type() const override;
41 bool ShouldExecuteInMainWorld() const override; 41 bool ShouldExecuteInMainWorld() const override;
42 bool IsUserGesture() const override; 42 bool IsUserGesture() const override;
43 bool ExpectsResults() const override; 43 bool ExpectsResults() const override;
44 bool ShouldInjectJs(UserScript::RunLocation run_location) const override; 44 bool ShouldInjectJs(UserScript::RunLocation run_location,
45 bool ShouldInjectCss(UserScript::RunLocation run_location) const override; 45 ScriptsRunInfo* scripts_run_info) const override;
46 bool ShouldInjectCss(UserScript::RunLocation run_location,
47 ScriptsRunInfo* scripts_run_info) const override;
46 PermissionsData::AccessType CanExecuteOnFrame( 48 PermissionsData::AccessType CanExecuteOnFrame(
47 const InjectionHost* injection_host, 49 const InjectionHost* injection_host,
48 blink::WebLocalFrame* web_frame, 50 blink::WebLocalFrame* web_frame,
49 int tab_id) const override; 51 int tab_id) const override;
50 std::vector<blink::WebScriptSource> GetJsSources( 52 std::vector<blink::WebScriptSource> GetJsSources(
51 UserScript::RunLocation run_location) const override; 53 UserScript::RunLocation run_location,
54 ScriptsRunInfo* scripts_run_info) const override;
52 std::vector<std::string> GetCssSources( 55 std::vector<std::string> GetCssSources(
53 UserScript::RunLocation run_location) const override; 56 UserScript::RunLocation run_location,
57 ScriptsRunInfo* scripts_run_info) const override;
54 void GetRunInfo(ScriptsRunInfo* scripts_run_info, 58 void GetRunInfo(ScriptsRunInfo* scripts_run_info,
55 UserScript::RunLocation run_location) const override; 59 UserScript::RunLocation run_location) const override;
56 void OnInjectionComplete(std::unique_ptr<base::Value> execution_result, 60 void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
57 UserScript::RunLocation run_location, 61 UserScript::RunLocation run_location,
58 content::RenderFrame* render_frame) override; 62 content::RenderFrame* render_frame) override;
59 void OnWillNotInject(InjectFailureReason reason, 63 void OnWillNotInject(InjectFailureReason reason,
60 content::RenderFrame* render_frame) override; 64 content::RenderFrame* render_frame) override;
61 65
62 // The associated user script. Owned by the UserScriptInjector that created 66 // The associated user script. Owned by the UserScriptInjector that created
63 // this object. 67 // this object.
(...skipping 13 matching lines...) Expand all
77 81
78 ScopedObserver<UserScriptSet, UserScriptSet::Observer> 82 ScopedObserver<UserScriptSet, UserScriptSet::Observer>
79 user_script_set_observer_; 83 user_script_set_observer_;
80 84
81 DISALLOW_COPY_AND_ASSIGN(UserScriptInjector); 85 DISALLOW_COPY_AND_ASSIGN(UserScriptInjector);
82 }; 86 };
83 87
84 } // namespace extensions 88 } // namespace extensions
85 89
86 #endif // EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_ 90 #endif // EXTENSIONS_RENDERER_USER_SCRIPT_INJECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698