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/gfx/text_elider.h" | 7 #include "app/gfx/text_elider.h" |
8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2503 | 2503 |
2504 void TabContents::LoadStateChanged(const GURL& url, | 2504 void TabContents::LoadStateChanged(const GURL& url, |
2505 net::LoadState load_state, | 2505 net::LoadState load_state, |
2506 uint64 upload_position, | 2506 uint64 upload_position, |
2507 uint64 upload_size) { | 2507 uint64 upload_size) { |
2508 load_state_ = load_state; | 2508 load_state_ = load_state; |
2509 upload_position_ = upload_position; | 2509 upload_position_ = upload_position; |
2510 upload_size_ = upload_size; | 2510 upload_size_ = upload_size; |
2511 std::wstring languages = | 2511 std::wstring languages = |
2512 profile()->GetPrefs()->GetString(prefs::kAcceptLanguages); | 2512 profile()->GetPrefs()->GetString(prefs::kAcceptLanguages); |
2513 load_state_host_.clear(); | |
2514 std::string host = url.host(); | 2513 std::string host = url.host(); |
2515 net::IDNToUnicode(host.c_str(), host.size(), languages, &load_state_host_); | 2514 load_state_host_ = |
| 2515 net::IDNToUnicode(host.c_str(), host.size(), languages, NULL); |
2516 if (load_state_ == net::LOAD_STATE_READING_RESPONSE) | 2516 if (load_state_ == net::LOAD_STATE_READING_RESPONSE) |
2517 SetNotWaitingForResponse(); | 2517 SetNotWaitingForResponse(); |
2518 if (is_loading()) | 2518 if (is_loading()) |
2519 NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_TAB); | 2519 NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_TAB); |
2520 } | 2520 } |
2521 | 2521 |
2522 bool TabContents::IsExternalTabContainer() const { | 2522 bool TabContents::IsExternalTabContainer() const { |
2523 if (!delegate()) | 2523 if (!delegate()) |
2524 return false; | 2524 return false; |
2525 | 2525 |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2697 render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt); | 2697 render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt); |
2698 } | 2698 } |
2699 | 2699 |
2700 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) { | 2700 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) { |
2701 set_suppress_javascript_messages(suppress_message_boxes); | 2701 set_suppress_javascript_messages(suppress_message_boxes); |
2702 } | 2702 } |
2703 | 2703 |
2704 void TabContents::set_encoding(const std::string& encoding) { | 2704 void TabContents::set_encoding(const std::string& encoding) { |
2705 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); | 2705 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); |
2706 } | 2706 } |
OLD | NEW |