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

Side by Side Diff: content/browser/plugin_process_host.cc

Issue 232483005: Enable --high-dpi-support by default. Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disabling broken unit tests. (Don't submit this code!) Created 6 years, 7 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
OLDNEW
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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 switches::kLogPluginMessages, 198 switches::kLogPluginMessages,
199 switches::kNoSandbox, 199 switches::kNoSandbox,
200 switches::kPluginStartupDialog, 200 switches::kPluginStartupDialog,
201 switches::kTestSandbox, 201 switches::kTestSandbox,
202 switches::kTraceStartup, 202 switches::kTraceStartup,
203 switches::kUseGL, 203 switches::kUseGL,
204 #if defined(OS_MACOSX) 204 #if defined(OS_MACOSX)
205 switches::kDisableCoreAnimationPlugins, 205 switches::kDisableCoreAnimationPlugins,
206 switches::kEnableSandboxLogging, 206 switches::kEnableSandboxLogging,
207 #endif 207 #endif
208 #if defined(OS_WIN)
209 switches::kHighDPISupport,
210 #endif
211 }; 208 };
212 209
213 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 210 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
214 arraysize(kSwitchNames)); 211 arraysize(kSwitchNames));
215 212
216 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line); 213 GpuDataManagerImpl::GetInstance()->AppendPluginCommandLine(cmd_line);
217 214
218 // If specified, prepend a launcher program to the command line. 215 // If specified, prepend a launcher program to the command line.
219 if (!plugin_launcher.empty()) 216 if (!plugin_launcher.empty())
220 cmd_line->PrependWrapper(plugin_launcher); 217 cmd_line->PrependWrapper(plugin_launcher);
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 418
422 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, 419 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request,
423 ResourceContext** resource_context, 420 ResourceContext** resource_context,
424 net::URLRequestContext** request_context) { 421 net::URLRequestContext** request_context) {
425 *resource_context = 422 *resource_context =
426 resource_context_map_[request.origin_pid].resource_context; 423 resource_context_map_[request.origin_pid].resource_context;
427 *request_context = (*resource_context)->GetRequestContext(); 424 *request_context = (*resource_context)->GetRequestContext();
428 } 425 }
429 426
430 } // namespace content 427 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698