| OLD | NEW |
| 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 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1221 ui::PageTransition* transition, | 1221 ui::PageTransition* transition, |
| 1222 bool* is_renderer_initiated, | 1222 bool* is_renderer_initiated, |
| 1223 content::Referrer* referrer) { | 1223 content::Referrer* referrer) { |
| 1224 DCHECK(transition); | 1224 DCHECK(transition); |
| 1225 DCHECK(is_renderer_initiated); | 1225 DCHECK(is_renderer_initiated); |
| 1226 DCHECK(referrer); | 1226 DCHECK(referrer); |
| 1227 // TODO(crbug.com/624410): Factor the predicate to identify a URL as an NTP | 1227 // TODO(crbug.com/624410): Factor the predicate to identify a URL as an NTP |
| 1228 // to a shared library. | 1228 // to a shared library. |
| 1229 if (site_instance && | 1229 if (site_instance && |
| 1230 site_instance->GetSiteURL().SchemeIs(chrome::kChromeSearchScheme) && | 1230 site_instance->GetSiteURL().SchemeIs(chrome::kChromeSearchScheme) && |
| 1231 (site_instance->GetSiteURL().host() == | 1231 (site_instance->GetSiteURL().host_piece() == |
| 1232 chrome::kChromeSearchRemoteNtpHost || | 1232 chrome::kChromeSearchRemoteNtpHost || |
| 1233 site_instance->GetSiteURL().host() == | 1233 site_instance->GetSiteURL().host_piece() == |
| 1234 chrome::kChromeSearchLocalNtpHost) && | 1234 chrome::kChromeSearchLocalNtpHost) && |
| 1235 ui::PageTransitionCoreTypeIs(*transition, ui::PAGE_TRANSITION_LINK)) { | 1235 ui::PageTransitionCoreTypeIs(*transition, ui::PAGE_TRANSITION_LINK)) { |
| 1236 // Use AUTO_BOOKMARK for clicks on tiles of the new tab page, consistently | 1236 // Use AUTO_BOOKMARK for clicks on tiles of the new tab page, consistently |
| 1237 // with native implementations like Android's. | 1237 // with native implementations like Android's. |
| 1238 *transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK; | 1238 *transition = ui::PAGE_TRANSITION_AUTO_BOOKMARK; |
| 1239 *is_renderer_initiated = false; | 1239 *is_renderer_initiated = false; |
| 1240 *referrer = content::Referrer(); | 1240 *referrer = content::Referrer(); |
| 1241 } | 1241 } |
| 1242 | 1242 |
| 1243 #if BUILDFLAG(ENABLE_EXTENSIONS) | 1243 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| (...skipping 1994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3238 kWebRtcDevSwitchNames, | 3238 kWebRtcDevSwitchNames, |
| 3239 arraysize(kWebRtcDevSwitchNames)); | 3239 arraysize(kWebRtcDevSwitchNames)); |
| 3240 } | 3240 } |
| 3241 } | 3241 } |
| 3242 #endif // defined(ENABLE_WEBRTC) | 3242 #endif // defined(ENABLE_WEBRTC) |
| 3243 | 3243 |
| 3244 std::unique_ptr<content::MemoryCoordinatorDelegate> | 3244 std::unique_ptr<content::MemoryCoordinatorDelegate> |
| 3245 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { | 3245 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { |
| 3246 return memory::ChromeMemoryCoordinatorDelegate::Create(); | 3246 return memory::ChromeMemoryCoordinatorDelegate::Create(); |
| 3247 } | 3247 } |
| OLD | NEW |