Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(646)

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_icon_source.h

Issue 330603004: Rename FaviconBitmapXxx to FaviconRawBitmapXxx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_ 6 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 void LoadExtensionImage(const ExtensionResource& icon, 103 void LoadExtensionImage(const ExtensionResource& icon,
104 int request_id); 104 int request_id);
105 105
106 // Loads the favicon image for the app associated with the |request_id|. If 106 // Loads the favicon image for the app associated with the |request_id|. If
107 // the image does not exist, we fall back to the default image. 107 // the image does not exist, we fall back to the default image.
108 void LoadFaviconImage(int request_id); 108 void LoadFaviconImage(int request_id);
109 109
110 // FaviconService callback 110 // FaviconService callback
111 void OnFaviconDataAvailable( 111 void OnFaviconDataAvailable(
112 int request_id, 112 int request_id,
113 const favicon_base::FaviconBitmapResult& bitmap_result); 113 const favicon_base::FaviconRawBitmapResult& bitmap_result);
114 114
115 // ImageLoader callback 115 // ImageLoader callback
116 void OnImageLoaded(int request_id, const gfx::Image& image); 116 void OnImageLoaded(int request_id, const gfx::Image& image);
117 117
118 // Called when the extension doesn't have an icon. We fall back to multiple 118 // Called when the extension doesn't have an icon. We fall back to multiple
119 // sources, using the following order: 119 // sources, using the following order:
120 // 1) The icons as listed in the extension / app manifests. 120 // 1) The icons as listed in the extension / app manifests.
121 // 2) If a 16px icon and the extension has a launch URL, see if Chrome 121 // 2) If a 16px icon and the extension has a launch URL, see if Chrome
122 // has a corresponding favicon. 122 // has a corresponding favicon.
123 // 3) If still no matches, load the default extension / application icon. 123 // 3) If still no matches, load the default extension / application icon.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 scoped_ptr<SkBitmap> default_extension_data_; 157 scoped_ptr<SkBitmap> default_extension_data_;
158 158
159 base::CancelableTaskTracker cancelable_task_tracker_; 159 base::CancelableTaskTracker cancelable_task_tracker_;
160 160
161 DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource); 161 DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
162 }; 162 };
163 163
164 } // namespace extensions 164 } // namespace extensions
165 165
166 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_ 166 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698