OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); | 561 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL); |
562 case net::LOAD_STATE_RESOLVING_HOST: | 562 case net::LOAD_STATE_RESOLVING_HOST: |
563 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_HOST); | 563 return l10n_util::GetString(IDS_LOAD_STATE_RESOLVING_HOST); |
564 case net::LOAD_STATE_CONNECTING: | 564 case net::LOAD_STATE_CONNECTING: |
565 return l10n_util::GetString(IDS_LOAD_STATE_CONNECTING); | 565 return l10n_util::GetString(IDS_LOAD_STATE_CONNECTING); |
566 case net::LOAD_STATE_SENDING_REQUEST: | 566 case net::LOAD_STATE_SENDING_REQUEST: |
567 return l10n_util::GetString(IDS_LOAD_STATE_SENDING_REQUEST); | 567 return l10n_util::GetString(IDS_LOAD_STATE_SENDING_REQUEST); |
568 case net::LOAD_STATE_WAITING_FOR_RESPONSE: | 568 case net::LOAD_STATE_WAITING_FOR_RESPONSE: |
569 return l10n_util::GetStringF(IDS_LOAD_STATE_WAITING_FOR_RESPONSE, | 569 return l10n_util::GetStringF(IDS_LOAD_STATE_WAITING_FOR_RESPONSE, |
570 load_state_host_); | 570 load_state_host_); |
571 // Ignore net::LOAD_STATE_READING_RESPONSE and net::LOAD_STATE_IDLE | 571 // Ignore net::LOAD_STATE_READING_RESPONSE, net::LOAD_STATE_IDLE and |
| 572 // net::LOAD_STATE_NONE. |
572 case net::LOAD_STATE_IDLE: | 573 case net::LOAD_STATE_IDLE: |
573 case net::LOAD_STATE_READING_RESPONSE: | 574 case net::LOAD_STATE_READING_RESPONSE: |
| 575 case net::LOAD_STATE_WAITING_FOR_USER_ACTION: |
574 break; | 576 break; |
575 } | 577 } |
576 | 578 |
577 return std::wstring(); | 579 return std::wstring(); |
578 } | 580 } |
579 | 581 |
580 void TabContents::SetIsCrashed(bool state) { | 582 void TabContents::SetIsCrashed(bool state) { |
581 if (state == is_crashed_) | 583 if (state == is_crashed_) |
582 return; | 584 return; |
583 | 585 |
(...skipping 1860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2444 NavigationController::LoadCommittedDetails& committed_details = | 2446 NavigationController::LoadCommittedDetails& committed_details = |
2445 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); | 2447 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); |
2446 ExpireInfoBars(committed_details); | 2448 ExpireInfoBars(committed_details); |
2447 break; | 2449 break; |
2448 } | 2450 } |
2449 | 2451 |
2450 default: | 2452 default: |
2451 NOTREACHED(); | 2453 NOTREACHED(); |
2452 } | 2454 } |
2453 } | 2455 } |
OLD | NEW |