Index: content/browser/tab_contents/tab_contents.cc |
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc |
index 04a11986b4efce7052049284eb852a8c68f1b56d..b6fddc77fdf16a16411993b63bbb8c9f25dcdb05 100644 |
--- a/content/browser/tab_contents/tab_contents.cc |
+++ b/content/browser/tab_contents/tab_contents.cc |
@@ -178,7 +178,7 @@ TabContents::TabContents(content::BrowserContext* browser_context, |
crashed_error_code_(0), |
waiting_for_response_(false), |
max_page_id_(-1), |
- load_state_(net::LOAD_STATE_IDLE), |
+ load_state_(net::LOAD_STATE_IDLE, ""), |
upload_size_(0), |
upload_position_(0), |
displayed_insecure_content_(false), |
@@ -1067,7 +1067,8 @@ void TabContents::SetIsLoading(bool is_loading, |
return; |
if (!is_loading) { |
- load_state_ = net::LOAD_STATE_IDLE; |
+ load_state_.state = net::LOAD_STATE_IDLE; |
eroman
2011/08/05 01:54:22
nit: how about load_state_ = LoadStateWithParams(I
Matt Perry
2011/08/08 22:14:33
Done.
|
+ load_state_.param.clear(); |
load_state_host_.clear(); |
upload_size_ = 0; |
upload_position_ = 0; |
@@ -1772,7 +1773,7 @@ void TabContents::RendererResponsive(RenderViewHost* render_view_host) { |
} |
void TabContents::LoadStateChanged(const GURL& url, |
- net::LoadState load_state, |
+ const net::LoadStateWithParam& load_state, |
uint64 upload_position, |
uint64 upload_size) { |
load_state_ = load_state; |
@@ -1780,7 +1781,7 @@ void TabContents::LoadStateChanged(const GURL& url, |
upload_size_ = upload_size; |
load_state_host_ = net::IDNToUnicode(url.host(), |
content::GetContentClient()->browser()->GetAcceptLangs(this)); |
- if (load_state_ == net::LOAD_STATE_READING_RESPONSE) |
+ if (load_state_.state == net::LOAD_STATE_READING_RESPONSE) |
SetNotWaitingForResponse(); |
if (IsLoading()) |
NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_TAB); |