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

Side by Side Diff: chrome/browser/extensions/active_script_controller.h

Issue 288053002: Block content scripts from executing until user grants permission (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CQ Time! Created 6 years, 6 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 | Annotate | Revision Log
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 CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
6 #define CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void RequestScriptInjection(const Extension* extension, 55 void RequestScriptInjection(const Extension* extension,
56 int page_id, 56 int page_id,
57 const base::Closure& callback); 57 const base::Closure& callback);
58 58
59 // Notifies the ActiveScriptController that an extension has been granted 59 // Notifies the ActiveScriptController that an extension has been granted
60 // active tab permissions. This will run any pending injections for that 60 // active tab permissions. This will run any pending injections for that
61 // extension. 61 // extension.
62 void OnActiveTabPermissionGranted(const Extension* extension); 62 void OnActiveTabPermissionGranted(const Extension* extension);
63 63
64 // Notifies the ActiveScriptController of detected ad injection. 64 // Notifies the ActiveScriptController of detected ad injection.
65 void OnAdInjectionDetected(const std::set<std::string> ad_injectors); 65 void OnAdInjectionDetected(const std::set<std::string>& ad_injectors);
66 66
67 // LocationBarControllerProvider implementation. 67 // LocationBarControllerProvider implementation.
68 virtual ExtensionAction* GetActionForExtension( 68 virtual ExtensionAction* GetActionForExtension(
69 const Extension* extension) OVERRIDE; 69 const Extension* extension) OVERRIDE;
70 virtual LocationBarController::Action OnClicked( 70 virtual LocationBarController::Action OnClicked(
71 const Extension* extension) OVERRIDE; 71 const Extension* extension) OVERRIDE;
72 virtual void OnNavigated() OVERRIDE; 72 virtual void OnNavigated() OVERRIDE;
73 73
74 private: 74 private:
75 // A single pending request. This could be a pair, but we'd have way too many 75 // A single pending request. This could be a pair, but we'd have way too many
76 // stl typedefs, and "request.closure" is nicer than "request.first". 76 // stl typedefs, and "request.closure" is nicer than "request.first".
77 struct PendingRequest { 77 struct PendingRequest {
78 PendingRequest(); // For STL. 78 PendingRequest(); // For STL.
79 PendingRequest(const base::Closure& closure, int page_id); 79 PendingRequest(const base::Closure& closure, int page_id);
80 ~PendingRequest(); 80 ~PendingRequest();
81 81
82 base::Closure closure; 82 base::Closure closure;
83 int page_id; 83 int page_id;
84 }; 84 };
85 typedef std::vector<PendingRequest> PendingRequestList; 85 typedef std::vector<PendingRequest> PendingRequestList;
86 typedef std::map<std::string, PendingRequestList> PendingRequestMap; 86 typedef std::map<std::string, PendingRequestList> PendingRequestMap;
87 87
88 // Runs any pending injections for the corresponding extension. 88 // Runs any pending injections for the corresponding extension.
89 void RunPendingForExtension(const Extension* extension); 89 void RunPendingForExtension(const Extension* extension);
90 90
91 // Handles the NotifyExtensionScriptExecution message. 91 // Handle the RequestContentScriptPermission message.
92 void OnNotifyExtensionScriptExecution(const std::string& extension_id, 92 void OnRequestContentScriptPermission(const std::string& extension_id,
93 int page_id); 93 int page_id,
94 int request_id);
95
96 // Grants permission for the given request to run.
97 void GrantContentScriptPermission(int request_id);
94 98
95 // content::WebContentsObserver implementation. 99 // content::WebContentsObserver implementation.
96 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 100 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
97 101
98 // Log metrics. 102 // Log metrics.
99 void LogUMA() const; 103 void LogUMA() const;
100 104
101 // Whether or not the ActiveScriptController is enabled (corresponding to the 105 // Whether or not the ActiveScriptController is enabled (corresponding to the
102 // kActiveScriptEnforcement switch). If it is not, it acts as an empty shell, 106 // kActiveScriptEnforcement switch). If it is not, it acts as an empty shell,
103 // always allowing scripts to run and never displaying actions. 107 // always allowing scripts to run and never displaying actions.
(...skipping 13 matching lines...) Expand all
117 // that get generated for extensions that haven't declared anything. 121 // that get generated for extensions that haven't declared anything.
118 typedef std::map<std::string, linked_ptr<ExtensionAction> > ActiveScriptMap; 122 typedef std::map<std::string, linked_ptr<ExtensionAction> > ActiveScriptMap;
119 ActiveScriptMap active_script_actions_; 123 ActiveScriptMap active_script_actions_;
120 124
121 DISALLOW_COPY_AND_ASSIGN(ActiveScriptController); 125 DISALLOW_COPY_AND_ASSIGN(ActiveScriptController);
122 }; 126 };
123 127
124 } // namespace extensions 128 } // namespace extensions
125 129
126 #endif // CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_ 130 #endif // CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/active_script_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698