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

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

Issue 1309243004: Reland again [Startup Tracing] Add --trace-config-file flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test Created 5 years, 3 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // any associated values) if present in the browser command line 215 // any associated values) if present in the browser command line
216 static const char* const kSwitchNames[] = { 216 static const char* const kSwitchNames[] = {
217 switches::kDisableBreakpad, 217 switches::kDisableBreakpad,
218 switches::kDisableDirectNPAPIRequests, 218 switches::kDisableDirectNPAPIRequests,
219 switches::kEnableStatsTable, 219 switches::kEnableStatsTable,
220 switches::kFullMemoryCrashReport, 220 switches::kFullMemoryCrashReport,
221 switches::kLoggingLevel, 221 switches::kLoggingLevel,
222 switches::kLogPluginMessages, 222 switches::kLogPluginMessages,
223 switches::kNoSandbox, 223 switches::kNoSandbox,
224 switches::kPluginStartupDialog, 224 switches::kPluginStartupDialog,
225 switches::kTraceConfigFile,
225 switches::kTraceStartup, 226 switches::kTraceStartup,
226 switches::kUseGL, 227 switches::kUseGL,
227 switches::kForceDeviceScaleFactor, 228 switches::kForceDeviceScaleFactor,
228 #if defined(OS_MACOSX) 229 #if defined(OS_MACOSX)
229 switches::kDisableCoreAnimationPlugins, 230 switches::kDisableCoreAnimationPlugins,
230 switches::kEnableSandboxLogging, 231 switches::kEnableSandboxLogging,
231 #endif 232 #endif
232 }; 233 };
233 234
234 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 235 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 429
429 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request, 430 void PluginProcessHost::GetContexts(const ResourceHostMsg_Request& request,
430 ResourceContext** resource_context, 431 ResourceContext** resource_context,
431 net::URLRequestContext** request_context) { 432 net::URLRequestContext** request_context) {
432 *resource_context = 433 *resource_context =
433 resource_context_map_[request.origin_pid].resource_context; 434 resource_context_map_[request.origin_pid].resource_context;
434 *request_context = (*resource_context)->GetRequestContext(); 435 *request_context = (*resource_context)->GetRequestContext();
435 } 436 }
436 437
437 } // namespace content 438 } // 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