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

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

Issue 21544005: Take the navigation type into account when checking if the navigation is in page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing an approach a bit. Created 7 years, 4 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
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/navigation_controller_impl.h" 5 #include "content/browser/web_contents/navigation_controller_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" // Temporary 10 #include "base/strings/string_number_conversions.h" // Temporary
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 case NAVIGATION_TYPE_NEW_PAGE: 751 case NAVIGATION_TYPE_NEW_PAGE:
752 RendererDidNavigateToNewPage(params, details->did_replace_entry); 752 RendererDidNavigateToNewPage(params, details->did_replace_entry);
753 break; 753 break;
754 case NAVIGATION_TYPE_EXISTING_PAGE: 754 case NAVIGATION_TYPE_EXISTING_PAGE:
755 RendererDidNavigateToExistingPage(params); 755 RendererDidNavigateToExistingPage(params);
756 break; 756 break;
757 case NAVIGATION_TYPE_SAME_PAGE: 757 case NAVIGATION_TYPE_SAME_PAGE:
758 RendererDidNavigateToSamePage(params); 758 RendererDidNavigateToSamePage(params);
759 break; 759 break;
760 case NAVIGATION_TYPE_IN_PAGE: 760 case NAVIGATION_TYPE_IN_PAGE:
761 // When navigating back from a ref URL to the top non ref one is_in_page
762 // is false (see AreURLsInPageNavigation()). In order to set the flag
763 // properly take the navigation type into account as well.
764 details->is_in_page = true;
Charlie Reis 2013/08/05 22:18:10 Putting it here doesn't help other callers of IsUR
761 RendererDidNavigateInPage(params, &details->did_replace_entry); 765 RendererDidNavigateInPage(params, &details->did_replace_entry);
762 break; 766 break;
763 case NAVIGATION_TYPE_NEW_SUBFRAME: 767 case NAVIGATION_TYPE_NEW_SUBFRAME:
764 RendererDidNavigateNewSubframe(params); 768 RendererDidNavigateNewSubframe(params);
765 break; 769 break;
766 case NAVIGATION_TYPE_AUTO_SUBFRAME: 770 case NAVIGATION_TYPE_AUTO_SUBFRAME:
767 if (!RendererDidNavigateAutoSubframe(params)) 771 if (!RendererDidNavigateAutoSubframe(params))
768 return false; 772 return false;
769 break; 773 break;
770 case NAVIGATION_TYPE_NAV_IGNORE: 774 case NAVIGATION_TYPE_NAV_IGNORE:
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1684 } 1688 }
1685 } 1689 }
1686 } 1690 }
1687 1691
1688 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1692 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1689 const base::Callback<base::Time()>& get_timestamp_callback) { 1693 const base::Callback<base::Time()>& get_timestamp_callback) {
1690 get_timestamp_callback_ = get_timestamp_callback; 1694 get_timestamp_callback_ = get_timestamp_callback;
1691 } 1695 }
1692 1696
1693 } // namespace content 1697 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698