OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/browser/plugin_process_host.h" | 5 #include "content/browser/plugin_process_host.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #elif defined(OS_POSIX) | 9 #elif defined(OS_POSIX) |
10 #include <utility> // for pair<> | 10 #include <utility> // for pair<> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/string_util.h" | 21 #include "base/string_util.h" |
22 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
23 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
24 #include "chrome/browser/net/url_request_tracking.h" | 24 #include "chrome/browser/net/url_request_tracking.h" |
25 #include "chrome/browser/plugin_download_helper.h" | 25 #include "chrome/browser/plugin_download_helper.h" |
26 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
27 #include "chrome/common/chrome_paths.h" | 27 #include "chrome/common/chrome_paths.h" |
28 #include "chrome/common/chrome_switches.h" | 28 #include "chrome/common/chrome_switches.h" |
29 #include "chrome/common/logging_chrome.h" | 29 #include "chrome/common/logging_chrome.h" |
30 #include "chrome/common/net/url_request_context_getter.h" | 30 #include "chrome/common/net/url_request_context_getter.h" |
31 #include "chrome/common/plugin_messages.h" | |
32 #include "chrome/common/render_messages.h" | 31 #include "chrome/common/render_messages.h" |
33 #include "chrome/common/render_messages_params.h" | 32 #include "chrome/common/render_messages_params.h" |
34 #include "content/browser/browser_thread.h" | 33 #include "content/browser/browser_thread.h" |
35 #include "content/browser/plugin_service.h" | 34 #include "content/browser/plugin_service.h" |
36 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 35 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
37 #include "content/browser/renderer_host/resource_message_filter.h" | 36 #include "content/browser/renderer_host/resource_message_filter.h" |
| 37 #include "content/common/plugin_messages.h" |
38 #include "content/common/resource_messages.h" | 38 #include "content/common/resource_messages.h" |
39 #include "ipc/ipc_switches.h" | 39 #include "ipc/ipc_switches.h" |
40 #include "net/base/io_buffer.h" | 40 #include "net/base/io_buffer.h" |
41 #include "net/url_request/url_request.h" | 41 #include "net/url_request/url_request.h" |
42 #include "net/url_request/url_request_context.h" | 42 #include "net/url_request/url_request_context.h" |
43 #include "ui/base/ui_base_switches.h" | 43 #include "ui/base/ui_base_switches.h" |
44 #include "ui/gfx/native_widget_types.h" | 44 #include "ui/gfx/native_widget_types.h" |
45 | 45 |
46 #if defined(USE_X11) | 46 #if defined(USE_X11) |
47 #include "ui/gfx/gtk_native_view_id_manager.h" | 47 #include "ui/gfx/gtk_native_view_id_manager.h" |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 } | 376 } |
377 | 377 |
378 if (!g_browser_process->plugin_finder_disabled()) { | 378 if (!g_browser_process->plugin_finder_disabled()) { |
379 // TODO(iyengar): Add the plumbing to retrieve the default | 379 // TODO(iyengar): Add the plumbing to retrieve the default |
380 // plugin finder URL. | 380 // plugin finder URL. |
381 *plugin_finder_url = kDefaultPluginFinderURL; | 381 *plugin_finder_url = kDefaultPluginFinderURL; |
382 } else { | 382 } else { |
383 plugin_finder_url->clear(); | 383 plugin_finder_url->clear(); |
384 } | 384 } |
385 } | 385 } |
OLD | NEW |