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

Unified Diff: chrome/browser/ui/extensions/shell_window.cc

Issue 13007002: Create launcher app list for shell windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/extensions/shell_window.cc
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 4303c5f132a3369f6212737a9f7258d9e50cb8a4..6f7ba9ce3ca9d55f7f1f2dc48b6f720b79110d3b 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -309,19 +309,20 @@ void ShellWindow::OnNativeWindowChanged() {
shell_window_contents_->NativeWindowChanged(native_app_window_.get());
}
-gfx::Image* ShellWindow::GetAppListIcon() {
+scoped_ptr<gfx::Image> ShellWindow::GetAppListIcon() {
// TODO(skuhne): We might want to use LoadImages in UpdateExtensionAppIcon
// instead to let the extension give us pre-defined icons in the launcher
// and the launcher list sizes. Since there is no mock yet, doing this now
// seems a bit premature and we scale for the time being.
if (app_icon_.IsEmpty())
- return new gfx::Image();
+ return make_scoped_ptr(new gfx::Image());
SkBitmap bmp = skia::ImageOperations::Resize(
*app_icon_.ToSkBitmap(), skia::ImageOperations::RESIZE_BEST,
extension_misc::EXTENSION_ICON_SMALLISH,
extension_misc::EXTENSION_ICON_SMALLISH);
- return new gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp));
+ return make_scoped_ptr(
+ new gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp)));
}
content::WebContents* ShellWindow::web_contents() const {
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698