OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/browser/chrome_plugin_host.h" | 5 #include "chrome/browser/chrome_plugin_host.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/histogram.h" | 13 #include "base/histogram.h" |
14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
16 #include "base/perftimer.h" | 16 #include "base/perftimer.h" |
17 #include "base/singleton.h" | 17 #include "base/singleton.h" |
18 #include "base/string_util.h" | 18 #include "base/string_util.h" |
19 #include "chrome/browser/browser_list.h" | 19 #include "chrome/browser/browser_list.h" |
| 20 #include "chrome/browser/chrome_thread.h" |
20 #include "chrome/browser/chrome_plugin_browsing_context.h" | 21 #include "chrome/browser/chrome_plugin_browsing_context.h" |
21 #include "chrome/browser/chrome_thread.h" | 22 #include "chrome/browser/chrome_thread.h" |
22 #include "chrome/browser/dom_ui/html_dialog_ui.h" | 23 #include "chrome/browser/dom_ui/html_dialog_ui.h" |
23 #include "chrome/browser/gears_integration.h" | 24 #include "chrome/browser/gears_integration.h" |
24 #include "chrome/browser/net/url_request_context_getter.h" | 25 #include "chrome/browser/net/url_request_context_getter.h" |
25 #include "chrome/browser/plugin_process_host.h" | 26 #include "chrome/browser/plugin_process_host.h" |
26 #include "chrome/browser/plugin_service.h" | 27 #include "chrome/browser/plugin_service.h" |
27 #include "chrome/browser/profile.h" | 28 #include "chrome/browser/profile.h" |
28 #include "chrome/browser/renderer_host/render_process_host.h" | 29 #include "chrome/browser/renderer_host/render_process_host.h" |
29 #include "chrome/common/chrome_constants.h" | 30 #include "chrome/common/chrome_constants.h" |
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 | 811 |
811 return &browser_funcs; | 812 return &browser_funcs; |
812 } | 813 } |
813 | 814 |
814 void CPHandleCommand(int command, CPCommandInterface* data, | 815 void CPHandleCommand(int command, CPCommandInterface* data, |
815 CPBrowsingContext context) { | 816 CPBrowsingContext context) { |
816 // Sadly if we try and pass context through, we seem to break cl's little | 817 // Sadly if we try and pass context through, we seem to break cl's little |
817 // brain trying to compile the Tuple3 ctor. This cast works. | 818 // brain trying to compile the Tuple3 ctor. This cast works. |
818 int32 context_as_int32 = static_cast<int32>(context); | 819 int32 context_as_int32 = static_cast<int32>(context); |
819 // Plugins can only be accessed on the IO thread. | 820 // Plugins can only be accessed on the IO thread. |
820 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, | 821 ChromeThread::PostTask( |
| 822 ChromeThread::IO, FROM_HERE, |
821 NewRunnableFunction(PluginCommandHandler::HandleCommand, | 823 NewRunnableFunction(PluginCommandHandler::HandleCommand, |
822 command, data, context_as_int32)); | 824 command, data, context_as_int32)); |
823 } | 825 } |
OLD | NEW |