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 "content/browser/tab_contents/tab_contents.h" | 5 #include "content/browser/tab_contents/tab_contents.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1794 upload_position_ = upload_position; | 1794 upload_position_ = upload_position; |
1795 upload_size_ = upload_size; | 1795 upload_size_ = upload_size; |
1796 load_state_host_ = net::IDNToUnicode(url.host(), | 1796 load_state_host_ = net::IDNToUnicode(url.host(), |
1797 content::GetContentClient()->browser()->GetAcceptLangs(this)); | 1797 content::GetContentClient()->browser()->GetAcceptLangs(this)); |
1798 if (load_state_ == net::LOAD_STATE_READING_RESPONSE) | 1798 if (load_state_ == net::LOAD_STATE_READING_RESPONSE) |
1799 SetNotWaitingForResponse(); | 1799 SetNotWaitingForResponse(); |
1800 if (IsLoading()) | 1800 if (IsLoading()) |
1801 NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_TAB); | 1801 NotifyNavigationStateChanged(INVALIDATE_LOAD | INVALIDATE_TAB); |
1802 } | 1802 } |
1803 | 1803 |
1804 void TabContents::OffsetAndPruneHistory(int offset) { | |
1805 RenderViewHost* rvh = render_view_host(); | |
1806 if (!rvh) | |
1807 return; | |
1808 rvh->Send(new ViewMsg_OffsetAndPruneHistory(rvh->routing_id(), offset)); | |
brettw
2011/08/09 16:29:47
Don't we need to do something similar to this for
cbentzel
2011/08/09 16:47:22
cross-site transitions work correctly with the exi
brettw
2011/08/09 18:14:40
Okay, I think that answers my question: in the cro
cbentzel
2011/08/09 19:12:14
Thanks for thinking of that case. I entered a bug:
| |
1809 } | |
1810 | |
1804 void TabContents::WorkerCrashed() { | 1811 void TabContents::WorkerCrashed() { |
1805 if (delegate()) | 1812 if (delegate()) |
1806 delegate()->WorkerCrashed(this); | 1813 delegate()->WorkerCrashed(this); |
1807 } | 1814 } |
1808 | 1815 |
1809 void TabContents::BeforeUnloadFiredFromRenderManager( | 1816 void TabContents::BeforeUnloadFiredFromRenderManager( |
1810 bool proceed, | 1817 bool proceed, |
1811 bool* proceed_to_fire_unload) { | 1818 bool* proceed_to_fire_unload) { |
1812 if (delegate()) | 1819 if (delegate()) |
1813 delegate()->BeforeUnloadFired(this, proceed, proceed_to_fire_unload); | 1820 delegate()->BeforeUnloadFired(this, proceed, proceed_to_fire_unload); |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1904 } | 1911 } |
1905 | 1912 |
1906 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { | 1913 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { |
1907 render_manager_.SwapInRenderViewHost(rvh); | 1914 render_manager_.SwapInRenderViewHost(rvh); |
1908 } | 1915 } |
1909 | 1916 |
1910 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { | 1917 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { |
1911 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); | 1918 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); |
1912 rwh_view->SetSize(view()->GetContainerSize()); | 1919 rwh_view->SetSize(view()->GetContainerSize()); |
1913 } | 1920 } |
OLD | NEW |