| Index: components/image_fetcher/content/image_decoder.h
|
| diff --git a/chrome/browser/image_decoder.h b/components/image_fetcher/content/image_decoder.h
|
| similarity index 92%
|
| rename from chrome/browser/image_decoder.h
|
| rename to components/image_fetcher/content/image_decoder.h
|
| index 2a0d3225aaf2329bcb382fefd005a2c88b60ba3c..b34ed5f0886338c75427bcfddc1e1be47fafbc64 100644
|
| --- a/chrome/browser/image_decoder.h
|
| +++ b/components/image_fetcher/content/image_decoder.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_IMAGE_DECODER_H_
|
| -#define CHROME_BROWSER_IMAGE_DECODER_H_
|
| +#ifndef COMPONENTS_IMAGE_FETCHER_CONTENT_IMAGE_DECODER_H_
|
| +#define COMPONENTS_IMAGE_FETCHER_CONTENT_IMAGE_DECODER_H_
|
|
|
| #include <map>
|
| #include <string>
|
| @@ -71,8 +71,8 @@ class ImageDecoder {
|
| DEFAULT_CODEC = 0, // Uses WebKit image decoding (via WebImage).
|
| #if defined(OS_CHROMEOS)
|
| ROBUST_JPEG_CODEC, // Restrict decoding to robust jpeg codec.
|
| - ROBUST_PNG_CODEC, // Restrict decoding to robust PNG codec.
|
| -#endif // defined(OS_CHROMEOS)
|
| + ROBUST_PNG_CODEC, // Restrict decoding to robust PNG codec.
|
| +#endif // defined(OS_CHROMEOS)
|
| };
|
|
|
| static ImageDecoder* GetInstance();
|
| @@ -82,8 +82,7 @@ class ImageDecoder {
|
| static void Start(ImageRequest* image_request,
|
| std::vector<uint8_t> image_data);
|
| // Deprecated. Use std::vector<uint8_t> version to avoid an extra copy.
|
| - static void Start(ImageRequest* image_request,
|
| - const std::string& image_data);
|
| + static void Start(ImageRequest* image_request, const std::string& image_data);
|
|
|
| // Starts asynchronous image decoding. Once finished, the callback will be
|
| // posted back to image_request's |task_runner_|.
|
| @@ -137,4 +136,4 @@ class ImageDecoder {
|
| DISALLOW_COPY_AND_ASSIGN(ImageDecoder);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_IMAGE_DECODER_H_
|
| +#endif // COMPONENTS_IMAGE_FETCHER_CONTENT_IMAGE_DECODER_H_
|
|
|