OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/ui/search/new_tab_page_interceptor_service.h" | 5 #include "chrome/browser/ui/search/new_tab_page_interceptor_service.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/location.h" | 9 #include "base/location.h" |
8 #include "base/logging.h" | 10 #include "base/logging.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
11 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/search/search.h" | 14 #include "chrome/browser/search/search.h" |
13 #include "chrome/browser/search_engines/template_url_service_factory.h" | 15 #include "chrome/browser/search_engines/template_url_service_factory.h" |
14 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
15 #include "components/search_engines/template_url_service.h" | 17 #include "components/search_engines/template_url_service.h" |
16 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 base::Bind(&NewTabPageInterceptor::SetNewTabPageURL, interceptor_, | 115 base::Bind(&NewTabPageInterceptor::SetNewTabPageURL, interceptor_, |
114 new_tab_page_url)); | 116 new_tab_page_url)); |
115 } | 117 } |
116 | 118 |
117 scoped_ptr<net::URLRequestInterceptor> | 119 scoped_ptr<net::URLRequestInterceptor> |
118 NewTabPageInterceptorService::CreateInterceptor() { | 120 NewTabPageInterceptorService::CreateInterceptor() { |
119 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 121 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
120 scoped_ptr<NewTabPageInterceptor> interceptor( | 122 scoped_ptr<NewTabPageInterceptor> interceptor( |
121 new NewTabPageInterceptor(search::GetNewTabPageURL(profile_))); | 123 new NewTabPageInterceptor(search::GetNewTabPageURL(profile_))); |
122 interceptor_ = interceptor->GetWeakPtr(); | 124 interceptor_ = interceptor->GetWeakPtr(); |
123 return interceptor.Pass(); | 125 return std::move(interceptor); |
124 } | 126 } |
OLD | NEW |