Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
|
samarth
2015/05/18 16:41:52
nit: Does the date need to be update for a plain m
Dan Beam
2015/05/18 17:45:23
nah, it doesn't. reverted.
| |
| 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/webui/ntp/thumbnail_source.h" | 5 #include "chrome/browser/search/thumbnail_source.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "chrome/browser/search/instant_io_context.h" | 10 #include "chrome/browser/search/instant_io_context.h" |
| 11 #include "chrome/browser/thumbnails/thumbnail_service.h" | 11 #include "chrome/browser/thumbnails/thumbnail_service.h" |
| 12 #include "chrome/browser/thumbnails/thumbnail_service_factory.h" | 12 #include "chrome/browser/thumbnails/thumbnail_service_factory.h" |
| 13 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 14 #include "net/url_request/url_request.h" | 14 #include "net/url_request/url_request.h" |
| 15 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 return thumbnail_service_.get() ? | 57 return thumbnail_service_.get() ? |
| 58 NULL : content::URLDataSource::MessageLoopForRequestPath(path); | 58 NULL : content::URLDataSource::MessageLoopForRequestPath(path); |
| 59 } | 59 } |
| 60 | 60 |
| 61 bool ThumbnailSource::ShouldServiceRequest( | 61 bool ThumbnailSource::ShouldServiceRequest( |
| 62 const net::URLRequest* request) const { | 62 const net::URLRequest* request) const { |
| 63 if (request->url().SchemeIs(chrome::kChromeSearchScheme)) | 63 if (request->url().SchemeIs(chrome::kChromeSearchScheme)) |
| 64 return InstantIOContext::ShouldServiceRequest(request); | 64 return InstantIOContext::ShouldServiceRequest(request); |
| 65 return URLDataSource::ShouldServiceRequest(request); | 65 return URLDataSource::ShouldServiceRequest(request); |
| 66 } | 66 } |
| OLD | NEW |