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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1144443005: Revert of Tests that the title only ever gets replaced for the current page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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 | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
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 3850 matching lines...) Expand 10 before | Expand all | Expand 10 after
3861 3861
3862 // If we have a title, that's a pretty good indication that we've started 3862 // If we have a title, that's a pretty good indication that we've started
3863 // getting useful data. 3863 // getting useful data.
3864 SetNotWaitingForResponse(); 3864 SetNotWaitingForResponse();
3865 3865
3866 // Try to find the navigation entry, which might not be the current one. 3866 // Try to find the navigation entry, which might not be the current one.
3867 // For example, it might be from a pending RVH for the pending entry. 3867 // For example, it might be from a pending RVH for the pending entry.
3868 NavigationEntryImpl* entry = controller_.GetEntryWithPageID( 3868 NavigationEntryImpl* entry = controller_.GetEntryWithPageID(
3869 rvh->GetSiteInstance(), page_id); 3869 rvh->GetSiteInstance(), page_id);
3870 3870
3871 // Re http://crbug.com/369661, page id is going away. This function should
3872 // only ever be called for the last committed entry. When this is verified,
3873 // this function can be greatly simplified.
3874 CHECK_EQ(entry, controller_.GetLastCommittedEntry());
3875
3876 // We can handle title updates when we don't have an entry in 3871 // We can handle title updates when we don't have an entry in
3877 // UpdateTitleForEntry, but only if the update is from the current RVH. 3872 // UpdateTitleForEntry, but only if the update is from the current RVH.
3878 // TODO(avi): Change to make decisions based on the RenderFrameHost. 3873 // TODO(avi): Change to make decisions based on the RenderFrameHost.
3879 if (!entry && rvh != GetRenderViewHost()) 3874 if (!entry && rvh != GetRenderViewHost())
3880 return; 3875 return;
3881 3876
3882 // TODO(evan): make use of title_direction. 3877 // TODO(evan): make use of title_direction.
3883 // http://code.google.com/p/chromium/issues/detail?id=27094 3878 // http://code.google.com/p/chromium/issues/detail?id=27094
3884 if (!UpdateTitleForEntry(entry, title)) 3879 if (!UpdateTitleForEntry(entry, title))
3885 return; 3880 return;
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
4434 node->render_manager()->ResumeResponseDeferredAtStart(); 4429 node->render_manager()->ResumeResponseDeferredAtStart();
4435 } 4430 }
4436 4431
4437 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4432 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4438 force_disable_overscroll_content_ = force_disable; 4433 force_disable_overscroll_content_ = force_disable;
4439 if (view_) 4434 if (view_)
4440 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4435 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4441 } 4436 }
4442 4437
4443 } // namespace content 4438 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698