| Index: content/browser/tab_contents/tab_contents.h
|
| diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
|
| index f7b71c5e4f2cc6cd4cd23b6e4008d12af1108e21..a4358f0486d72ce5bc49b44e9d2775178a1c956e 100644
|
| --- a/content/browser/tab_contents/tab_contents.h
|
| +++ b/content/browser/tab_contents/tab_contents.h
|
| @@ -179,8 +179,8 @@ class TabContents : public PageNavigator,
|
| // "waiting" or "loading."
|
| bool waiting_for_response() const { return waiting_for_response_; }
|
|
|
| - net::LoadState load_state() const { return load_state_; }
|
| - string16 load_state_host() const { return load_state_host_; }
|
| + const net::LoadStateWithParam& load_state() const { return load_state_; }
|
| + const string16& load_state_host() const { return load_state_host_; }
|
| uint64 upload_size() const { return upload_size_; }
|
| uint64 upload_position() const { return upload_position_; }
|
|
|
| @@ -687,7 +687,7 @@ class TabContents : public PageNavigator,
|
| bool is_during_unload) OVERRIDE;
|
| virtual void RendererResponsive(RenderViewHost* render_view_host) OVERRIDE;
|
| virtual void LoadStateChanged(const GURL& url,
|
| - net::LoadState load_state,
|
| + const net::LoadStateWithParam& load_state,
|
| uint64 upload_position,
|
| uint64 upload_size) OVERRIDE;
|
| virtual void WorkerCrashed() OVERRIDE;
|
| @@ -779,7 +779,7 @@ class TabContents : public PageNavigator,
|
| base::TimeTicks current_load_start_;
|
|
|
| // The current load state and the URL associated with it.
|
| - net::LoadState load_state_;
|
| + net::LoadStateWithParam load_state_;
|
| string16 load_state_host_;
|
| // Upload progress, for displaying in the status bar.
|
| // Set to zero when there is no significant upload happening.
|
|
|