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

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

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 years, 1 month 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | net/base/load_states.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/tab_contents/tab_contents_wrapper.h" 5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 tab_contents()->load_state().param); 481 tab_contents()->load_state().param);
482 case net::LOAD_STATE_WAITING_FOR_CACHE: 482 case net::LOAD_STATE_WAITING_FOR_CACHE:
483 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE); 483 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE);
484 case net::LOAD_STATE_WAITING_FOR_APPCACHE: 484 case net::LOAD_STATE_WAITING_FOR_APPCACHE:
485 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_APPCACHE); 485 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_APPCACHE);
486 case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL: 486 case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL:
487 return 487 return
488 l10n_util::GetStringUTF16(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL); 488 l10n_util::GetStringUTF16(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL);
489 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL: 489 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL:
490 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); 490 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL);
491 case net::LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT:
492 return l10n_util::GetStringUTF16(
493 IDS_LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT);
491 case net::LOAD_STATE_RESOLVING_HOST: 494 case net::LOAD_STATE_RESOLVING_HOST:
492 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_HOST); 495 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_HOST);
493 case net::LOAD_STATE_CONNECTING: 496 case net::LOAD_STATE_CONNECTING:
494 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING); 497 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING);
495 case net::LOAD_STATE_SSL_HANDSHAKE: 498 case net::LOAD_STATE_SSL_HANDSHAKE:
496 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_SSL_HANDSHAKE); 499 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_SSL_HANDSHAKE);
497 case net::LOAD_STATE_SENDING_REQUEST: 500 case net::LOAD_STATE_SENDING_REQUEST:
498 if (tab_contents()->upload_size()) 501 if (tab_contents()->upload_size())
499 return l10n_util::GetStringFUTF16Int( 502 return l10n_util::GetStringFUTF16Int(
500 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS, 503 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 render_view_host()->Send( 685 render_view_host()->Send(
683 new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(), 686 new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(),
684 safe_browsing)); 687 safe_browsing));
685 #endif 688 #endif
686 } 689 }
687 690
688 void TabContentsWrapper::ExitFullscreenMode() { 691 void TabContentsWrapper::ExitFullscreenMode() {
689 if (tab_contents() && render_view_host()) 692 if (tab_contents() && render_view_host())
690 tab_contents()->render_view_host()->ExitFullscreen(); 693 tab_contents()->render_view_host()->ExitFullscreen();
691 } 694 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | net/base/load_states.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698