From 12b54c7e402f562081ba94d43317080f0aa6ba99 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Sat, 14 Jun 2014 00:38:48 +0000 Subject: Rename * FaviconBitmapXxx to FaviconRawBitmapXxx * FaviconRawCallback to FaviconRawBitmapCallback * FaviconService::GetXXXForPage to FaviconService::GetXxxcForPageURL BUG=None R=pkotwicz@chromium.org TBR=sky@chromium.org Review URL: https://codereview.chromium.org/330603004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277142 0039d316-1c4b-4281-b951-d872f2087c98 --- components/favicon_base/favicon_callback.h | 11 ++++++----- components/favicon_base/favicon_types.cc | 11 +++++++---- components/favicon_base/favicon_types.h | 10 +++++----- components/favicon_base/select_favicon_frames.h | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) (limited to 'components/favicon_base') diff --git a/components/favicon_base/favicon_callback.h b/components/favicon_base/favicon_callback.h index 437c4ec..7616a11 100644 --- a/components/favicon_base/favicon_callback.h +++ b/components/favicon_base/favicon_callback.h @@ -11,7 +11,7 @@ namespace favicon_base { -struct FaviconBitmapResult; +struct FaviconRawBitmapResult; struct FaviconImageResult; // Callback for functions that can be used to return a |gfx::Image| and the @@ -19,13 +19,14 @@ struct FaviconImageResult; typedef base::Callback FaviconImageCallback; // Callback for functions returning raw data for a favicon. In -// |FaviconBitmapResult|, the data is not yet converted as a |gfx::Image|. -typedef base::Callback FaviconRawCallback; +// |FaviconRawBitmapResult|, the data is not yet converted as a |gfx::Image|. +typedef base::Callback + FaviconRawBitmapCallback; // Callback for functions returning raw data for a favicon in multiple -// resolution. In |FaviconBitmapResult|, the data is not yet converted as a +// resolution. In |FaviconRawBitmapResult|, the data is not yet converted as a // |gfx::Image|. -typedef base::Callback&)> +typedef base::Callback&)> FaviconResultsCallback; } // namespace favicon_base diff --git a/components/favicon_base/favicon_types.cc b/components/favicon_base/favicon_types.cc index 837da69..eb0e7bc 100644 --- a/components/favicon_base/favicon_types.cc +++ b/components/favicon_base/favicon_types.cc @@ -12,11 +12,14 @@ FaviconImageResult::FaviconImageResult() {} FaviconImageResult::~FaviconImageResult() {} -// FaviconBitmapResult -------------------------------------------------------- +// FaviconRawBitmapResult +// -------------------------------------------------------- -FaviconBitmapResult::FaviconBitmapResult() - : expired(false), icon_type(INVALID_ICON) {} +FaviconRawBitmapResult::FaviconRawBitmapResult() + : expired(false), icon_type(INVALID_ICON) { +} -FaviconBitmapResult::~FaviconBitmapResult() {} +FaviconRawBitmapResult::~FaviconRawBitmapResult() { +} } // namespace chrome diff --git a/components/favicon_base/favicon_types.h b/components/favicon_base/favicon_types.h index 34fd57e..f99f038 100644 --- a/components/favicon_base/favicon_types.h +++ b/components/favicon_base/favicon_types.h @@ -45,9 +45,9 @@ struct FaviconImageResult { // Defines a favicon bitmap which best matches the desired DIP size and one of // the desired scale factors. -struct FaviconBitmapResult { - FaviconBitmapResult(); - ~FaviconBitmapResult(); +struct FaviconRawBitmapResult { + FaviconRawBitmapResult(); + ~FaviconRawBitmapResult(); // Returns true if |bitmap_data| contains a valid bitmap. bool is_valid() const { return bitmap_data.get() && bitmap_data->size(); } @@ -68,9 +68,9 @@ struct FaviconBitmapResult { IconType icon_type; }; -// Define type with same structure as FaviconBitmapResult for passing data to +// Define type with same structure as FaviconRawBitmapResult for passing data to // HistoryBackend::SetFavicons(). -typedef FaviconBitmapResult FaviconBitmapData; +typedef FaviconRawBitmapResult FaviconRawBitmapData; } // namespace favicon_base diff --git a/components/favicon_base/select_favicon_frames.h b/components/favicon_base/select_favicon_frames.h index cc57a80..597a8f1 100644 --- a/components/favicon_base/select_favicon_frames.h +++ b/components/favicon_base/select_favicon_frames.h @@ -17,7 +17,7 @@ class Size; } // Score which is smaller than the minimum score returned by -// SelectFaviconFrames() or SelectFaviconBitmapIDs(). +// SelectFaviconFrames() or SelectFaviconFrameIndices(). extern const float kSelectFaviconFramesInvalidScore; // Takes a list of all bitmaps found in a .ico file, and creates an -- cgit v1.1