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

Side by Side Diff: webkit/tools/test_shell/test_shell_gtk.cc

Issue 164305: Ensure we don't load plugins on the IO thread (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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 | « webkit/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/test_shell.h" 5 #include "webkit/tools/test_shell/test_shell.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <fontconfig/fontconfig.h> 9 #include <fontconfig/fontconfig.h>
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 case IDR_BROKENIMAGE: 685 case IDR_BROKENIMAGE:
686 resource_id = IDR_BROKENIMAGE_TESTSHELL; 686 resource_id = IDR_BROKENIMAGE_TESTSHELL;
687 break; 687 break;
688 case IDR_TEXTAREA_RESIZER: 688 case IDR_TEXTAREA_RESIZER:
689 resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL; 689 resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
690 break; 690 break;
691 } 691 }
692 return TestShell::NetResourceProvider(resource_id); 692 return TestShell::NetResourceProvider(resource_id);
693 } 693 }
694 694
695 bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { 695 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
696 return NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); 696 NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
697 } 697 }
698 698
699 } // namespace webkit_glue 699 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698