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

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

Issue 2116613002: Prevent duplicate content script injection defined in manifest.json (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed code review comments from patch 7 Created 4 years, 5 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_PROGRAMMATIC_SCRIPT_INJECTOR_H_ 5 #ifndef EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
6 #define EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_ 6 #define EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 22 matching lines...) Expand all
33 bool ShouldExecuteInMainWorld() const override; 33 bool ShouldExecuteInMainWorld() const override;
34 bool IsUserGesture() const override; 34 bool IsUserGesture() const override;
35 bool ExpectsResults() const override; 35 bool ExpectsResults() const override;
36 bool ShouldInjectJs(UserScript::RunLocation run_location) const override; 36 bool ShouldInjectJs(UserScript::RunLocation run_location) const override;
37 bool ShouldInjectCss(UserScript::RunLocation run_location) const override; 37 bool ShouldInjectCss(UserScript::RunLocation run_location) const override;
38 PermissionsData::AccessType CanExecuteOnFrame( 38 PermissionsData::AccessType CanExecuteOnFrame(
39 const InjectionHost* injection_host, 39 const InjectionHost* injection_host,
40 blink::WebLocalFrame* web_frame, 40 blink::WebLocalFrame* web_frame,
41 int tab_id) const override; 41 int tab_id) const override;
42 std::vector<blink::WebScriptSource> GetJsSources( 42 std::vector<blink::WebScriptSource> GetJsSources(
43 UserScript::RunLocation run_location) const override; 43 UserScript::RunLocation run_location,
44 ScriptsRunInfo* scripts_run_info) const override;
45
Devlin 2016/07/19 23:10:36 delete this blank line
catmullings 2016/07/20 16:00:36 Done.
44 std::vector<std::string> GetCssSources( 46 std::vector<std::string> GetCssSources(
45 UserScript::RunLocation run_location) const override; 47 UserScript::RunLocation run_location,
48 ScriptsRunInfo* scripts_run_info) const override;
46 void GetRunInfo(ScriptsRunInfo* scripts_run_info, 49 void GetRunInfo(ScriptsRunInfo* scripts_run_info,
47 UserScript::RunLocation run_location) const override; 50 UserScript::RunLocation run_location) const override;
48 void OnInjectionComplete(std::unique_ptr<base::Value> execution_result, 51 void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
49 UserScript::RunLocation run_location, 52 UserScript::RunLocation run_location,
50 content::RenderFrame* render_frame) override; 53 content::RenderFrame* render_frame) override;
51 void OnWillNotInject(InjectFailureReason reason, 54 void OnWillNotInject(InjectFailureReason reason,
52 content::RenderFrame* render_frame) override; 55 content::RenderFrame* render_frame) override;
53 56
54 // Whether it is safe to include information about the URL in error messages. 57 // Whether it is safe to include information about the URL in error messages.
55 bool CanShowUrlInError() const; 58 bool CanShowUrlInError() const;
(...skipping 20 matching lines...) Expand all
76 79
77 // Whether or not this script injection has finished. 80 // Whether or not this script injection has finished.
78 bool finished_; 81 bool finished_;
79 82
80 DISALLOW_COPY_AND_ASSIGN(ProgrammaticScriptInjector); 83 DISALLOW_COPY_AND_ASSIGN(ProgrammaticScriptInjector);
81 }; 84 };
82 85
83 } // namespace extensions 86 } // namespace extensions
84 87
85 #endif // EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_ 88 #endif // EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698