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

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

Issue 9348028: Revert 120789 - Propogate status setting for profiler to track parents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/profiler_message_filter.cc ('k') | content/common/child_process_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 } 902 }
903 return listener->OnMessageReceived(msg); 903 return listener->OnMessageReceived(msg);
904 } 904 }
905 905
906 void RenderProcessHostImpl::OnChannelConnected(int32 peer_pid) { 906 void RenderProcessHostImpl::OnChannelConnected(int32 peer_pid) {
907 #if defined(IPC_MESSAGE_LOG_ENABLED) 907 #if defined(IPC_MESSAGE_LOG_ENABLED)
908 Send(new ChildProcessMsg_SetIPCLoggingEnabled( 908 Send(new ChildProcessMsg_SetIPCLoggingEnabled(
909 IPC::Logging::GetInstance()->Enabled())); 909 IPC::Logging::GetInstance()->Enabled()));
910 #endif 910 #endif
911 911
912 tracked_objects::ThreadData::Status status = 912 bool enable = tracked_objects::ThreadData::tracking_status();
913 tracked_objects::ThreadData::status(); 913 Send(new ChildProcessMsg_SetProfilerStatus(enable));
914 Send(new ChildProcessMsg_SetProfilerStatus(status));
915 } 914 }
916 915
917 void RenderProcessHostImpl::OnChannelError() { 916 void RenderProcessHostImpl::OnChannelError() {
918 if (!channel_.get()) 917 if (!channel_.get())
919 return; 918 return;
920 919
921 // Store the handle before it gets changed. 920 // Store the handle before it gets changed.
922 base::ProcessHandle handle = GetHandle(); 921 base::ProcessHandle handle = GetHandle();
923 922
924 // child_process_launcher_ can be NULL in single process mode or if fast 923 // child_process_launcher_ can be NULL in single process mode or if fast
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { 1295 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) {
1297 // Only honor the request if appropriate persmissions are granted. 1296 // Only honor the request if appropriate persmissions are granted.
1298 if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(GetID(), path)) 1297 if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(GetID(), path))
1299 content::GetContentClient()->browser()->OpenItem(path); 1298 content::GetContentClient()->browser()->OpenItem(path);
1300 } 1299 }
1301 1300
1302 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { 1301 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
1303 content::GetContentClient()->browser()->GetMHTMLGenerationManager()-> 1302 content::GetContentClient()->browser()->GetMHTMLGenerationManager()->
1304 MHTMLGenerated(job_id, data_size); 1303 MHTMLGenerated(job_id, data_size);
1305 } 1304 }
OLDNEW
« no previous file with comments | « content/browser/profiler_message_filter.cc ('k') | content/common/child_process_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698