| OLD | NEW |
| 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/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 case net::LOAD_STATE_WAITING_FOR_DELEGATE: | 469 case net::LOAD_STATE_WAITING_FOR_DELEGATE: |
| 470 return l10n_util::GetStringFUTF16(IDS_LOAD_STATE_WAITING_FOR_DELEGATE, | 470 return l10n_util::GetStringFUTF16(IDS_LOAD_STATE_WAITING_FOR_DELEGATE, |
| 471 tab_contents()->load_state().param); | 471 tab_contents()->load_state().param); |
| 472 case net::LOAD_STATE_WAITING_FOR_CACHE: | 472 case net::LOAD_STATE_WAITING_FOR_CACHE: |
| 473 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE); | 473 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_WAITING_FOR_CACHE); |
| 474 case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL: | 474 case net::LOAD_STATE_ESTABLISHING_PROXY_TUNNEL: |
| 475 return | 475 return |
| 476 l10n_util::GetStringUTF16(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL); | 476 l10n_util::GetStringUTF16(IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL); |
| 477 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL: | 477 case net::LOAD_STATE_RESOLVING_PROXY_FOR_URL: |
| 478 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); | 478 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); |
| 479 case net::LOAD_STATE_RESOLVING_HOST_FOR_PROXY_SCRIPT: |
| 480 return l10n_util::GetStringUTF16( |
| 481 IDS_LOAD_STATE_RESOLVING_HOST_FOR_PROXY_SCRIPT); |
| 479 case net::LOAD_STATE_RESOLVING_HOST: | 482 case net::LOAD_STATE_RESOLVING_HOST: |
| 480 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_HOST); | 483 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_RESOLVING_HOST); |
| 481 case net::LOAD_STATE_CONNECTING: | 484 case net::LOAD_STATE_CONNECTING: |
| 482 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING); | 485 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_CONNECTING); |
| 483 case net::LOAD_STATE_SSL_HANDSHAKE: | 486 case net::LOAD_STATE_SSL_HANDSHAKE: |
| 484 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_SSL_HANDSHAKE); | 487 return l10n_util::GetStringUTF16(IDS_LOAD_STATE_SSL_HANDSHAKE); |
| 485 case net::LOAD_STATE_SENDING_REQUEST: | 488 case net::LOAD_STATE_SENDING_REQUEST: |
| 486 if (tab_contents()->upload_size()) | 489 if (tab_contents()->upload_size()) |
| 487 return l10n_util::GetStringFUTF16Int( | 490 return l10n_util::GetStringFUTF16Int( |
| 488 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS, | 491 IDS_LOAD_STATE_SENDING_REQUEST_WITH_PROGRESS, |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 render_view_host()->Send( | 673 render_view_host()->Send( |
| 671 new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(), | 674 new ChromeViewMsg_SetClientSidePhishingDetection(routing_id(), |
| 672 safe_browsing)); | 675 safe_browsing)); |
| 673 #endif | 676 #endif |
| 674 } | 677 } |
| 675 | 678 |
| 676 void TabContentsWrapper::ExitFullscreenMode() { | 679 void TabContentsWrapper::ExitFullscreenMode() { |
| 677 if (tab_contents() && render_view_host()) | 680 if (tab_contents() && render_view_host()) |
| 678 tab_contents()->render_view_host()->ExitFullscreen(); | 681 tab_contents()->render_view_host()->ExitFullscreen(); |
| 679 } | 682 } |
| OLD | NEW |