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

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

Issue 61643022: Proxy private UMA pepper interface for out-of-process and NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove errant file, fix comment typo Created 7 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_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // Called in low-memory conditions to dump the memory used by the spellchecker 155 // Called in low-memory conditions to dump the memory used by the spellchecker
156 // and start over. 156 // and start over.
157 void OnPurgeMemory(); 157 void OnPurgeMemory();
158 158
159 static blink::WebPlugin* CreatePlugin( 159 static blink::WebPlugin* CreatePlugin(
160 content::RenderView* render_view, 160 content::RenderView* render_view,
161 blink::WebFrame* frame, 161 blink::WebFrame* frame,
162 const blink::WebPluginParams& params, 162 const blink::WebPluginParams& params,
163 const ChromeViewHostMsg_GetPluginInfo_Output& output); 163 const ChromeViewHostMsg_GetPluginInfo_Output& output);
164 164
165 static bool IsExtensionOrSharedModuleWhitelisted(
166 const GURL& url, const std::set<std::string>& whitelist);
yzshen1 2013/12/04 19:32:51 nit: - wrong indent. - please include <set>
elijahtaylor1 2013/12/21 02:26:21 Done.
167
165 // TODO(mpcomplete): remove after we collect histogram data. 168 // TODO(mpcomplete): remove after we collect histogram data.
166 // http://crbug.com/100411 169 // http://crbug.com/100411
167 static bool IsAdblockInstalled(); 170 static bool IsAdblockInstalled();
168 static bool IsAdblockPlusInstalled(); 171 static bool IsAdblockPlusInstalled();
169 static bool IsAdblockWithWebRequestInstalled(); 172 static bool IsAdblockWithWebRequestInstalled();
170 static bool IsAdblockPlusWithWebRequestInstalled(); 173 static bool IsAdblockPlusWithWebRequestInstalled();
171 static bool IsOtherExtensionWithWebRequestInstalled(); 174 static bool IsOtherExtensionWithWebRequestInstalled();
172 175
173 private: 176 private:
174 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 177 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_; 214 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
212 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 215 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
213 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; 216 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
214 #if defined(ENABLE_WEBRTC) 217 #if defined(ENABLE_WEBRTC)
215 scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_; 218 scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
216 #endif 219 #endif
217 scoped_ptr<SearchBouncer> search_bouncer_; 220 scoped_ptr<SearchBouncer> search_bouncer_;
218 }; 221 };
219 222
220 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 223 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698