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

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

Issue 10186001: Revert 133427 - Attempt to load component extension favicon from the resources first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 const SkBitmap* GetDefaultExtensionImage(); 88 const SkBitmap* GetDefaultExtensionImage();
89 89
90 // Performs any remaining transformations (like desaturating the |image|), 90 // Performs any remaining transformations (like desaturating the |image|),
91 // then returns the |image| to the client and clears up any temporary data 91 // then returns the |image| to the client and clears up any temporary data
92 // associated with the |request_id|. 92 // associated with the |request_id|.
93 void FinalizeImage(const SkBitmap* image, int request_id); 93 void FinalizeImage(const SkBitmap* image, int request_id);
94 94
95 // Loads the default image for |request_id| and returns to the client. 95 // Loads the default image for |request_id| and returns to the client.
96 void LoadDefaultImage(int request_id); 96 void LoadDefaultImage(int request_id);
97 97
98 // Tries loading component extension image. These usually come from resources
99 // instead of file system. Returns false if a given |icon| does not have
100 // a corresponding image in bundled resources.
101 bool TryLoadingComponentExtensionImage(const ExtensionResource& icon,
102 int request_id);
103
98 // Loads the extension's |icon| for the given |request_id| and returns the 104 // Loads the extension's |icon| for the given |request_id| and returns the
99 // image to the client. 105 // image to the client.
100 void LoadExtensionImage(const ExtensionResource& icon, int request_id); 106 void LoadExtensionImage(const ExtensionResource& icon, int request_id);
101 107
102 // Loads the favicon image for the app associated with the |request_id|. If 108 // Loads the favicon image for the app associated with the |request_id|. If
103 // the image does not exist, we fall back to the default image. 109 // the image does not exist, we fall back to the default image.
104 void LoadFaviconImage(int request_id); 110 void LoadFaviconImage(int request_id);
105 111
106 // FaviconService callback 112 // FaviconService callback
107 void OnFaviconDataAvailable(FaviconService::Handle request_handle, 113 void OnFaviconDataAvailable(FaviconService::Handle request_handle,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 scoped_ptr<SkBitmap> default_app_data_; 164 scoped_ptr<SkBitmap> default_app_data_;
159 165
160 scoped_ptr<SkBitmap> default_extension_data_; 166 scoped_ptr<SkBitmap> default_extension_data_;
161 167
162 CancelableRequestConsumerT<int, 0> cancelable_consumer_; 168 CancelableRequestConsumerT<int, 0> cancelable_consumer_;
163 169
164 DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource); 170 DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource);
165 }; 171 };
166 172
167 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_ 173 #endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_ICON_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698