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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2458093003: Add DCHECKs to validate ProfileIOData's list of protocols.
Patch Set: Merge remote-tracking branch 'origin/master' into detect_unregistered_schemes Created 4 years, 1 month 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 std::vector<std::string>* additional_schemes) { 1168 std::vector<std::string>* additional_schemes) {
1169 additional_schemes->push_back(chrome::kChromeSearchScheme); 1169 additional_schemes->push_back(chrome::kChromeSearchScheme);
1170 additional_schemes->push_back(dom_distiller::kDomDistillerScheme); 1170 additional_schemes->push_back(dom_distiller::kDomDistillerScheme);
1171 } 1171 }
1172 1172
1173 bool ChromeContentBrowserClient::LogWebUIUrl(const GURL& web_ui_url) const { 1173 bool ChromeContentBrowserClient::LogWebUIUrl(const GURL& web_ui_url) const {
1174 return webui::LogWebUIUrl(web_ui_url); 1174 return webui::LogWebUIUrl(web_ui_url);
1175 } 1175 }
1176 1176
1177 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) { 1177 bool ChromeContentBrowserClient::IsHandledURL(const GURL& url) {
1178 return ProfileIOData::IsHandledURL(url); 1178 return ProfileIOData::HasBuiltInProtocol(url);
1179 } 1179 }
1180 1180
1181 bool ChromeContentBrowserClient::CanCommitURL( 1181 bool ChromeContentBrowserClient::CanCommitURL(
1182 content::RenderProcessHost* process_host, 1182 content::RenderProcessHost* process_host,
1183 const GURL& url) { 1183 const GURL& url) {
1184 #if defined(ENABLE_EXTENSIONS) 1184 #if defined(ENABLE_EXTENSIONS)
1185 return ChromeContentBrowserClientExtensionsPart::CanCommitURL( 1185 return ChromeContentBrowserClientExtensionsPart::CanCommitURL(
1186 process_host, url); 1186 process_host, url);
1187 #else 1187 #else
1188 return true; 1188 return true;
(...skipping 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after
3229 kWebRtcDevSwitchNames, 3229 kWebRtcDevSwitchNames,
3230 arraysize(kWebRtcDevSwitchNames)); 3230 arraysize(kWebRtcDevSwitchNames));
3231 } 3231 }
3232 } 3232 }
3233 #endif // defined(ENABLE_WEBRTC) 3233 #endif // defined(ENABLE_WEBRTC)
3234 3234
3235 std::unique_ptr<content::MemoryCoordinatorDelegate> 3235 std::unique_ptr<content::MemoryCoordinatorDelegate>
3236 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { 3236 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
3237 return memory::ChromeMemoryCoordinatorDelegate::Create(); 3237 return memory::ChromeMemoryCoordinatorDelegate::Create();
3238 } 3238 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698