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

Side by Side Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 99011: Fix issue 11006 - any plugin process started by InProcessBrowserTest was... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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 | « chrome/browser/plugin_process_host.cc ('k') | chrome/common/chrome_switches.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/browser_render_process_host.h" 8 #include "chrome/browser/renderer_host/browser_render_process_host.h"
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 io_thread->message_loop(), true, 213 io_thread->message_loop(), true,
214 g_browser_process->shutdown_event())); 214 g_browser_process->shutdown_event()));
215 // As a preventive mesure, we DCHECK if someone sends a synchronous message 215 // As a preventive mesure, we DCHECK if someone sends a synchronous message
216 // with no time-out, which in the context of the browser process we should not 216 // with no time-out, which in the context of the browser process we should not
217 // be doing. 217 // be doing.
218 channel_->set_sync_messages_with_no_timeout_allowed(false); 218 channel_->set_sync_messages_with_no_timeout_allowed(false);
219 219
220 // Build command line for renderer, we have to quote the executable name to 220 // Build command line for renderer, we have to quote the executable name to
221 // deal with spaces. 221 // deal with spaces.
222 std::wstring renderer_path = 222 std::wstring renderer_path =
223 browser_command_line.GetSwitchValue(switches::kRendererPath); 223 browser_command_line.GetSwitchValue(switches::kBrowserSubprocessPath);
224 if (renderer_path.empty()) { 224 if (renderer_path.empty()) {
225 if (!GetRendererPath(&renderer_path)) { 225 if (!GetRendererPath(&renderer_path)) {
226 // Need to reset the channel we created above or others might think the 226 // Need to reset the channel we created above or others might think the
227 // connection is live. 227 // connection is live.
228 channel_.reset(); 228 channel_.reset();
229 return false; 229 return false;
230 } 230 }
231 } 231 }
232 CommandLine cmd_line(renderer_path); 232 CommandLine cmd_line(renderer_path);
233 if (logging::DialogsAreSuppressed()) 233 if (logging::DialogsAreSuppressed())
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 SendUserScriptsUpdate(shared_memory); 769 SendUserScriptsUpdate(shared_memory);
770 } 770 }
771 break; 771 break;
772 } 772 }
773 default: { 773 default: {
774 NOTREACHED(); 774 NOTREACHED();
775 break; 775 break;
776 } 776 }
777 } 777 }
778 } 778 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_process_host.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698