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

Side by Side Diff: chrome/renderer/content_settings_observer.h

Issue 777103002: Add the names of plugins to the blocked plugin bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make mergeable by reusing an existing string with existing translation Created 6 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 5 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 6 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 30 matching lines...) Expand all
41 // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this 41 // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this
42 // |ContentSettingsObserver|. 42 // |ContentSettingsObserver|.
43 void SetContentSettingRules( 43 void SetContentSettingRules(
44 const RendererContentSettingRules* content_setting_rules); 44 const RendererContentSettingRules* content_setting_rules);
45 45
46 bool IsPluginTemporarilyAllowed(const std::string& identifier); 46 bool IsPluginTemporarilyAllowed(const std::string& identifier);
47 47
48 // Sends an IPC notification that the specified content type was blocked. 48 // Sends an IPC notification that the specified content type was blocked.
49 void DidBlockContentType(ContentSettingsType settings_type); 49 void DidBlockContentType(ContentSettingsType settings_type);
50 50
51 // Sends an IPC notification that the specified content type was blocked
52 // with additional metadata.
53 void DidBlockContentType(ContentSettingsType settings_type,
54 const base::string16& details);
55
51 // blink::WebPermissionClient implementation. 56 // blink::WebPermissionClient implementation.
52 virtual bool allowDatabase(const blink::WebString& name, 57 virtual bool allowDatabase(const blink::WebString& name,
53 const blink::WebString& display_name, 58 const blink::WebString& display_name,
54 unsigned long estimated_size) override; 59 unsigned long estimated_size) override;
55 virtual void requestFileSystemAccessAsync( 60 virtual void requestFileSystemAccessAsync(
56 const blink::WebPermissionCallbacks& callbacks) override; 61 const blink::WebPermissionCallbacks& callbacks) override;
57 virtual bool allowImage(bool enabled_per_settings, 62 virtual bool allowImage(bool enabled_per_settings,
58 const blink::WebURL& image_url) override; 63 const blink::WebURL& image_url) override;
59 virtual bool allowIndexedDB(const blink::WebString& name, 64 virtual bool allowIndexedDB(const blink::WebString& name,
60 const blink::WebSecurityOrigin& origin) override; 65 const blink::WebSecurityOrigin& origin) override;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 bool npapi_plugins_blocked_; 155 bool npapi_plugins_blocked_;
151 156
152 int current_request_id_; 157 int current_request_id_;
153 typedef std::map<int, blink::WebPermissionCallbacks> PermissionRequestMap; 158 typedef std::map<int, blink::WebPermissionCallbacks> PermissionRequestMap;
154 PermissionRequestMap permission_requests_; 159 PermissionRequestMap permission_requests_;
155 160
156 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver); 161 DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
157 }; 162 };
158 163
159 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_ 164 #endif // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698