| OLD | NEW |
| 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 #include "chrome_frame/chrome_frame_automation.h" | 5 #include "chrome_frame/chrome_frame_automation.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 // was reused for a new active document instance. | 688 // was reused for a new active document instance. |
| 689 if (!chrome_launch_params_ || is_initialized() || | 689 if (!chrome_launch_params_ || is_initialized() || |
| 690 parsed_url != chrome_launch_params_->url()) { | 690 parsed_url != chrome_launch_params_->url()) { |
| 691 // Important: Since we will be using the referrer_ variable from a | 691 // Important: Since we will be using the referrer_ variable from a |
| 692 // different thread, we need to force a new std::string buffer instance for | 692 // different thread, we need to force a new std::string buffer instance for |
| 693 // the referrer_ GURL variable. Otherwise we can run into strangeness when | 693 // the referrer_ GURL variable. Otherwise we can run into strangeness when |
| 694 // the GURL is accessed and it could result in a bad URL that can cause the | 694 // the GURL is accessed and it could result in a bad URL that can cause the |
| 695 // referrer to be dropped or something worse. | 695 // referrer to be dropped or something worse. |
| 696 GURL referrer_gurl(referrer.c_str()); | 696 GURL referrer_gurl(referrer.c_str()); |
| 697 if (!chrome_launch_params_) { | 697 if (!chrome_launch_params_) { |
| 698 FilePath profile_path; | 698 base::FilePath profile_path; |
| 699 chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url, | 699 chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url, |
| 700 referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(), | 700 referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(), |
| 701 false, false, route_all_top_level_navigations_, | 701 false, false, route_all_top_level_navigations_, |
| 702 send_shutdown_delay_switch_); | 702 send_shutdown_delay_switch_); |
| 703 } else { | 703 } else { |
| 704 chrome_launch_params_->set_referrer(referrer_gurl); | 704 chrome_launch_params_->set_referrer(referrer_gurl); |
| 705 chrome_launch_params_->set_url(parsed_url); | 705 chrome_launch_params_->set_url(parsed_url); |
| 706 } | 706 } |
| 707 | 707 |
| 708 navigate_after_initialization_ = false; | 708 navigate_after_initialization_ = false; |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1336 const net::URLRequestStatus& status) { | 1336 const net::URLRequestStatus& status) { |
| 1337 automation_server_->Send(new AutomationMsg_RequestEnd( | 1337 automation_server_->Send(new AutomationMsg_RequestEnd( |
| 1338 tab_->handle(), request_id, status)); | 1338 tab_->handle(), request_id, status)); |
| 1339 } | 1339 } |
| 1340 | 1340 |
| 1341 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success, | 1341 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success, |
| 1342 const GURL& url, const std::string& cookie_string, int cookie_id) { | 1342 const GURL& url, const std::string& cookie_string, int cookie_id) { |
| 1343 automation_server_->Send(new AutomationMsg_GetCookiesHostResponse( | 1343 automation_server_->Send(new AutomationMsg_GetCookiesHostResponse( |
| 1344 tab_->handle(), success, url, cookie_string, cookie_id)); | 1344 tab_->handle(), success, url, cookie_string, cookie_id)); |
| 1345 } | 1345 } |
| OLD | NEW |