diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:25:04 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 19:25:04 +0000 |
| commit | 8a1f331497a81bb929ab75a3cfc8b1b835e21bcd (patch) | |
| tree | e608c6f36c92c0446ebf01899920d2b7d66f619f /chrome | |
| parent | 6b8ab84aa5133fdb73add7ba1771559cbc3ffd4c (diff) | |
| download | chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.zip chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.tar.gz chromium_src-8a1f331497a81bb929ab75a3cfc8b1b835e21bcd.tar.bz2 | |
Eliminate the establishing_tunnel_ internal state and move to explicit
states in the state machine for proxy tunnel establishment.
Original work from svandebo.
BUG=none
TEST=existing
Review URL: http://codereview.chromium.org/2101014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 98fb000..c053e53 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4557,6 +4557,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_LOAD_STATE_WAITING_FOR_CACHE"> Waiting for cache... </message> + <message name="IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL"> + Connecting to proxy... + </message> <message name="IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL"> Resolving proxy... </message> diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index f3160cc..573a6fe 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -680,6 +680,8 @@ std::wstring TabContents::GetStatusText() const { switch (load_state_) { case net::LOAD_STATE_WAITING_FOR_CACHE: return l10n_util::GetString(IDS_LOAD_STATE_WAITING_FOR_CACHE); + case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL: + return l10n_util::GetString(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL); case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL: return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); case net::LOAD_STATE_RESOLVING_HOST: |