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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 65343006: Use TracingController for startup tracing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/trace_controller_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 switches::kChildCleanExit, 1130 switches::kChildCleanExit,
1131 #endif 1131 #endif
1132 #if defined(OS_WIN) 1132 #if defined(OS_WIN)
1133 switches::kEnableHighResolutionTime, 1133 switches::kEnableHighResolutionTime,
1134 #endif 1134 #endif
1135 }; 1135 };
1136 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, 1136 renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
1137 arraysize(kSwitchNames)); 1137 arraysize(kSwitchNames));
1138 1138
1139 if (browser_cmd.HasSwitch(switches::kTraceStartup) && 1139 if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
1140 TraceControllerImpl::GetInstance()->is_tracing_startup()) { 1140 BrowserMainLoop::GetInstance()->is_tracing_startup()) {
1141 // Pass kTraceStartup switch to renderer only if startup tracing has not 1141 // Pass kTraceStartup switch to renderer only if startup tracing has not
1142 // finished. 1142 // finished.
1143 renderer_cmd->AppendSwitchASCII( 1143 renderer_cmd->AppendSwitchASCII(
1144 switches::kTraceStartup, 1144 switches::kTraceStartup,
1145 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup)); 1145 browser_cmd.GetSwitchValueASCII(switches::kTraceStartup));
1146 } 1146 }
1147 1147
1148 // Disable databases in incognito mode. 1148 // Disable databases in incognito mode.
1149 if (GetBrowserContext()->IsOffTheRecord() && 1149 if (GetBrowserContext()->IsOffTheRecord() &&
1150 !browser_cmd.HasSwitch(switches::kDisableDatabases)) { 1150 !browser_cmd.HasSwitch(switches::kDisableDatabases)) {
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 // Skip widgets in other processes. 1894 // Skip widgets in other processes.
1895 if (widget->GetProcess()->GetID() != GetID()) 1895 if (widget->GetProcess()->GetID() != GetID())
1896 continue; 1896 continue;
1897 1897
1898 RenderViewHost* rvh = RenderViewHost::From(widget); 1898 RenderViewHost* rvh = RenderViewHost::From(widget);
1899 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); 1899 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences());
1900 } 1900 }
1901 } 1901 }
1902 1902
1903 } // namespace content 1903 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/tracing/trace_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698