OLD | NEW |
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 #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 23 matching lines...) Expand all Loading... |
34 #include "content/public/browser/notification_types.h" | 34 #include "content/public/browser/notification_types.h" |
35 #include "content/public/browser/plugin_service.h" | 35 #include "content/public/browser/plugin_service.h" |
36 #include "content/public/browser/resource_context.h" | 36 #include "content/public/browser/resource_context.h" |
37 #include "content/public/common/content_switches.h" | 37 #include "content/public/common/content_switches.h" |
38 #include "content/public/common/process_type.h" | 38 #include "content/public/common/process_type.h" |
39 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 39 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
40 #include "ipc/ipc_switches.h" | 40 #include "ipc/ipc_switches.h" |
41 #include "net/url_request/url_request_context_getter.h" | 41 #include "net/url_request/url_request_context_getter.h" |
42 #include "ui/base/ui_base_switches.h" | 42 #include "ui/base/ui_base_switches.h" |
43 #include "ui/gfx/native_widget_types.h" | 43 #include "ui/gfx/native_widget_types.h" |
| 44 #include "ui/gfx/switches.h" |
44 #include "ui/gl/gl_switches.h" | 45 #include "ui/gl/gl_switches.h" |
45 | 46 |
46 #if defined(OS_MACOSX) | 47 #if defined(OS_MACOSX) |
47 #include "base/mac/mac_util.h" | 48 #include "base/mac/mac_util.h" |
48 #include "content/common/plugin_carbon_interpose_constants_mac.h" | 49 #include "content/common/plugin_carbon_interpose_constants_mac.h" |
49 #include "ui/gfx/rect.h" | 50 #include "ui/gfx/rect.h" |
50 #endif | 51 #endif |
51 | 52 |
52 #if defined(OS_WIN) | 53 #if defined(OS_WIN) |
53 #include "base/win/windows_version.h" | 54 #include "base/win/windows_version.h" |
54 #include "content/common/plugin_constants_win.h" | 55 #include "content/common/plugin_constants_win.h" |
55 #include "ui/gfx/switches.h" | |
56 #endif | 56 #endif |
57 | 57 |
58 namespace content { | 58 namespace content { |
59 | 59 |
60 #if defined(OS_WIN) | 60 #if defined(OS_WIN) |
61 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) { | 61 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) { |
62 // The window is destroyed at this point, we just care about its parent, which | 62 // The window is destroyed at this point, we just care about its parent, which |
63 // is the intermediate window we created. | 63 // is the intermediate window we created. |
64 std::set<HWND>::iterator window_index = | 64 std::set<HWND>::iterator window_index = |
65 plugin_parent_windows_set_.find(parent); | 65 plugin_parent_windows_set_.find(parent); |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 switches::kDisableBreakpad, | 200 switches::kDisableBreakpad, |
201 switches::kDisableDirectNPAPIRequests, | 201 switches::kDisableDirectNPAPIRequests, |
202 switches::kEnableStatsTable, | 202 switches::kEnableStatsTable, |
203 switches::kFullMemoryCrashReport, | 203 switches::kFullMemoryCrashReport, |
204 switches::kLoggingLevel, | 204 switches::kLoggingLevel, |
205 switches::kLogPluginMessages, | 205 switches::kLogPluginMessages, |
206 switches::kNoSandbox, | 206 switches::kNoSandbox, |
207 switches::kPluginStartupDialog, | 207 switches::kPluginStartupDialog, |
208 switches::kTraceStartup, | 208 switches::kTraceStartup, |
209 switches::kUseGL, | 209 switches::kUseGL, |
| 210 switches::kForceDeviceScaleFactor, |
210 #if defined(OS_MACOSX) | 211 #if defined(OS_MACOSX) |
211 switches::kDisableCoreAnimationPlugins, | 212 switches::kDisableCoreAnimationPlugins, |
212 switches::kEnableSandboxLogging, | 213 switches::kEnableSandboxLogging, |
213 #endif | 214 #endif |
214 }; | 215 }; |
215 | 216 |
216 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 217 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
217 arraysize(kSwitchNames)); | 218 arraysize(kSwitchNames)); |
218 | 219 |
219 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); | 220 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 | 425 |
425 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, | 426 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, |
426 ResourceContext** resource_context, | 427 ResourceContext** resource_context, |
427 net::URLRequestContext** request_context) { | 428 net::URLRequestContext** request_context) { |
428 *resource_context = | 429 *resource_context = |
429 resource_context_map_[request.origin_pid].resource_context; | 430 resource_context_map_[request.origin_pid].resource_context; |
430 *request_context = (*resource_context)->GetRequestContext(); | 431 *request_context = (*resource_context)->GetRequestContext(); |
431 } | 432 } |
432 | 433 |
433 } // namespace content | 434 } // namespace content |
OLD | NEW |