diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 17:22:28 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 17:22:28 +0000 |
commit | 0f1afed8d9f9f1849006fc6d93305d14986d16b6 (patch) | |
tree | 317787b597343760331431458fba0486bc49670f /chrome_frame/chrome_frame_automation.cc | |
parent | 9010941b17ea056d5dd8e28707262fa91d36b000 (diff) | |
download | chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.zip chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.gz chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.bz2 |
Keep deinlining stuff.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5783004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
-rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 7294e6f..e0cab31 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -952,19 +952,18 @@ void ChromeFrameAutomationClient::CreateExternalTab() { navigate_after_initialization_ = false; } - const IPC::ExternalTabSettings settings = { - m_hWnd, - gfx::Rect(), - WS_CHILD, - chrome_launch_params_->incognito(), - !use_chrome_network_, - handle_top_level_requests_, - chrome_launch_params_->url(), - chrome_launch_params_->referrer(), - // Infobars disabled in widget mode. - !chrome_launch_params_->widget_mode(), - chrome_launch_params_->route_all_top_level_navigations(), - }; + const IPC::ExternalTabSettings settings( + m_hWnd, + gfx::Rect(), + WS_CHILD, + chrome_launch_params_->incognito(), + !use_chrome_network_, + handle_top_level_requests_, + chrome_launch_params_->url(), + chrome_launch_params_->referrer(), + // Infobars disabled in widget mode. + !chrome_launch_params_->widget_mode(), + chrome_launch_params_->route_all_top_level_navigations()); THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS( "ChromeFrame.HostNetworking", !use_chrome_network_, 0, 1, 2); @@ -1441,14 +1440,13 @@ void ChromeFrameAutomationClient::OnResponseStarted(int request_id, const char* mime_type, const char* headers, int size, base::Time last_modified, const std::string& redirect_url, int redirect_status) { - const IPC::AutomationURLResponse response = { + const IPC::AutomationURLResponse response( mime_type, headers ? headers : "", size, last_modified, redirect_url, - redirect_status - }; + redirect_status); automation_server_->Send(new AutomationMsg_RequestStarted(0, tab_->handle(), request_id, response)); |