Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 2101014: Eliminate the establishing_tunnel_ internal state and move to explicit... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 // For GdkScreen 8 // For GdkScreen
9 #include <gdk/gdk.h> 9 #include <gdk/gdk.h>
10 #endif // defined(OS_CHROMEOS) 10 #endif // defined(OS_CHROMEOS)
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 return false; 673 return false;
674 } 674 }
675 675
676 std::wstring TabContents::GetStatusText() const { 676 std::wstring TabContents::GetStatusText() const {
677 if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE) 677 if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE)
678 return std::wstring(); 678 return std::wstring();
679 679
680 switch (load_state_) { 680 switch (load_state_) {
681 case net::LOAD_STATE_WAITING_FOR_CACHE: 681 case net::LOAD_STATE_WAITING_FOR_CACHE:
682 return l10n_util::GetString(IDS_LOAD_STATE_WAITING_FOR_CACHE); 682 return l10n_util::GetString(IDS_LOAD_STATE_WAITING_FOR_CACHE);
683 case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL:
684 return l10n_util::GetString(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL);
683 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL: 685 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL:
684 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); 686 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL);
685 case net::LOAD_STATE_RESOLVING_HOST: 687 case net::LOAD_STATE_RESOLVING_HOST:
686 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_HOST); 688 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_HOST);
687 case net::LOAD_STATE_CONNECTING: 689 case net::LOAD_STATE_CONNECTING:
688 return l10n_util::GetString(IDS_LOAD_STATE_CONNECTING); 690 return l10n_util::GetString(IDS_LOAD_STATE_CONNECTING);
689 case net::LOAD_STATE_SENDING_REQUEST: 691 case net::LOAD_STATE_SENDING_REQUEST:
690 if (upload_size_) 692 if (upload_size_)
691 return l10n_util::GetStringF( 693 return l10n_util::GetStringF(
692 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS, 694 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS,
(...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3174 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save)); 3176 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
3175 } 3177 }
3176 3178
3177 Profile* TabContents::GetProfileForPasswordManager() { 3179 Profile* TabContents::GetProfileForPasswordManager() {
3178 return profile(); 3180 return profile();
3179 } 3181 }
3180 3182
3181 bool TabContents::DidLastPageLoadEncounterSSLErrors() { 3183 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
3182 return controller().ssl_manager()->ProcessedSSLErrorFromRequest(); 3184 return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
3183 } 3185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698