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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.h

Issue 11777009: Remove redundant |errored| member from IconHostMsg_DidDownloadFavicon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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_EXTENSIONS_SHELL_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 9 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 const std::string& extension_id, 207 const std::string& extension_id,
208 int index) OVERRIDE; 208 int index) OVERRIDE;
209 209
210 // extensions::ExtensionKeybindingRegistry::Delegate implementation. 210 // extensions::ExtensionKeybindingRegistry::Delegate implementation.
211 virtual extensions::ActiveTabPermissionGranter* 211 virtual extensions::ActiveTabPermissionGranter*
212 GetActiveTabPermissionGranter() OVERRIDE; 212 GetActiveTabPermissionGranter() OVERRIDE;
213 213
214 // Callback from web_contents()->DownloadFavicon. 214 // Callback from web_contents()->DownloadFavicon.
215 void DidDownloadFavicon(int id, 215 void DidDownloadFavicon(int id,
216 const GURL& image_url, 216 const GURL& image_url,
217 bool errored,
218 int requested_size, 217 int requested_size,
219 const std::vector<SkBitmap>& bitmaps); 218 const std::vector<SkBitmap>& bitmaps);
220 219
221 // Updates the app image to |image|, called from image loader callback. 220 // Updates the app image to |image|, called from image loader callback.
222 void UpdateAppIcon(const gfx::Image& image); 221 void UpdateAppIcon(const gfx::Image& image);
223 222
224 Profile* profile_; // weak pointer - owned by ProfileManager. 223 Profile* profile_; // weak pointer - owned by ProfileManager.
225 // weak pointer - owned by ExtensionService. 224 // weak pointer - owned by ExtensionService.
226 const extensions::Extension* extension_; 225 const extensions::Extension* extension_;
227 226
(...skipping 18 matching lines...) Expand all
246 GURL app_icon_url_; 245 GURL app_icon_url_;
247 246
248 scoped_ptr<NativeAppWindow> native_app_window_; 247 scoped_ptr<NativeAppWindow> native_app_window_;
249 248
250 base::WeakPtrFactory<ShellWindow> weak_ptr_factory_; 249 base::WeakPtrFactory<ShellWindow> weak_ptr_factory_;
251 250
252 DISALLOW_COPY_AND_ASSIGN(ShellWindow); 251 DISALLOW_COPY_AND_ASSIGN(ShellWindow);
253 }; 252 };
254 253
255 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_ 254 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc ('k') | chrome/browser/ui/extensions/shell_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698