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

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

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/navigation_controller_impl.h" 5 #include "content/browser/frame_host/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 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 if (!delegate_->GetRenderViewHost()->IsRenderViewLive() && 647 if (!delegate_->GetRenderViewHost()->IsRenderViewLive() &&
648 !IsInitialNavigation()) 648 !IsInitialNavigation())
649 return; 649 return;
650 } 650 }
651 651
652 // Checks based on params.load_type. 652 // Checks based on params.load_type.
653 switch (params.load_type) { 653 switch (params.load_type) {
654 case LOAD_TYPE_DEFAULT: 654 case LOAD_TYPE_DEFAULT:
655 break; 655 break;
656 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: 656 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST:
657 if (!params.url.SchemeIs(kHttpScheme) && 657 if (!params.url.SchemeIs(url::kHttpScheme) &&
658 !params.url.SchemeIs(kHttpsScheme)) { 658 !params.url.SchemeIs(url::kHttpsScheme)) {
659 NOTREACHED() << "Http post load must use http(s) scheme."; 659 NOTREACHED() << "Http post load must use http(s) scheme.";
660 return; 660 return;
661 } 661 }
662 break; 662 break;
663 case LOAD_TYPE_DATA: 663 case LOAD_TYPE_DATA:
664 if (!params.url.SchemeIs(kDataScheme)) { 664 if (!params.url.SchemeIs(kDataScheme)) {
665 NOTREACHED() << "Data load must use data scheme."; 665 NOTREACHED() << "Data load must use data scheme.";
666 return; 666 return;
667 } 667 }
668 break; 668 break;
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 } 1740 }
1741 } 1741 }
1742 } 1742 }
1743 1743
1744 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1744 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1745 const base::Callback<base::Time()>& get_timestamp_callback) { 1745 const base::Callback<base::Time()>& get_timestamp_callback) {
1746 get_timestamp_callback_ = get_timestamp_callback; 1746 get_timestamp_callback_ = get_timestamp_callback;
1747 } 1747 }
1748 1748
1749 } // namespace content 1749 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/child_process_security_policy_unittest.cc ('k') | content/common/savable_url_schemes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698