chrome_frame/chrome_frame_automation.cc - Issue 5139001: Revert 66350 - Add named testing interface. This allows you to connect to a p...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/chrome_frame_automation.cc

Issue 5139001: Revert 66350 - Add named testing interface. This allows you to connect to a p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 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 side-by-side diff with in-line comments

Download patch

Index: chrome_frame/chrome_frame_automation.cc

===================================================================

--- chrome_frame/chrome_frame_automation.cc (revision 66367)

+++ chrome_frame/chrome_frame_automation.cc (working copy)

@@ -262,10 +262,8 @@

// destruction notification.

// At same time we must destroy/stop the thread from another thread.

- std::string channel_id = AutomationProxy::GenerateChannelID();

ChromeFrameAutomationProxyImpl* proxy =

new ChromeFrameAutomationProxyImpl(this, params->launch_timeout());

- proxy->InitializeChannel(channel_id, false);

// Ensure that the automation proxy actually respects our choice on whether

// or not to check the version.

@@ -275,7 +273,7 @@

scoped_ptr<CommandLine> command_line(

chrome_launcher::CreateLaunchCommandLine());

command_line->AppendSwitchASCII(switches::kAutomationClientChannelID,

- channel_id);

+ proxy->channel_id());

// Run Chrome in Chrome Frame mode. In practice, this modifies the paths

// and registry keys that Chrome looks in via the BrowserDistribution

« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/test/net/test_automation_provider.cc » ('j') | no next file with comments »