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

Side by Side Diff: chrome/plugin/plugin_thread.cc

Issue 6475011: Implemented policy to disable plugin finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged ToT and addressed comments. Created 9 years, 10 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
« no previous file with comments | « chrome/default_plugin/plugin_impl_win.cc ('k') | chrome/test/testing_browser_process.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/plugin/plugin_thread.h" 5 #include "chrome/plugin/plugin_thread.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(USE_X11) 9 #if defined(USE_X11)
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 NOTREACHED(); 197 NOTREACHED();
198 return false; 198 return false;
199 } 199 }
200 200
201 PluginThread* plugin_thread = PluginThread::current(); 201 PluginThread* plugin_thread = PluginThread::current();
202 if (!plugin_thread) 202 if (!plugin_thread)
203 return false; 203 return false;
204 204
205 plugin_thread->Send( 205 plugin_thread->Send(
206 new PluginProcessHostMsg_GetPluginFinderUrl(plugin_finder_url)); 206 new PluginProcessHostMsg_GetPluginFinderUrl(plugin_finder_url));
207 DCHECK(!plugin_finder_url->empty()); 207 // If we get an empty string back this means the plugin finder has been
208 // disabled.
208 return true; 209 return true;
209 } 210 }
210 211
211 bool IsDefaultPluginEnabled() { 212 bool IsDefaultPluginEnabled() {
212 return true; 213 return true;
213 } 214 }
214 215
215 // Dispatch the resolve proxy resquest to the right code, depending on which 216 // Dispatch the resolve proxy resquest to the right code, depending on which
216 // process the plugin is running in {renderer, browser, plugin}. 217 // process the plugin is running in {renderer, browser, plugin}.
217 bool FindProxyForUrl(const GURL& url, std::string* proxy_list) { 218 bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
(...skipping 10 matching lines...) Expand all
228 } 229 }
229 230
230 if (!result || net_error != net::OK) 231 if (!result || net_error != net::OK)
231 return false; 232 return false;
232 233
233 *proxy_list = proxy_result; 234 *proxy_list = proxy_result;
234 return true; 235 return true;
235 } 236 }
236 237
237 } // namespace webkit_glue 238 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/default_plugin/plugin_impl_win.cc ('k') | chrome/test/testing_browser_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698