Create launcher app list for shell windows

chrome/browser/ui/extensions/shell_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/extensions/shell_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/app_window_contents.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ skipping 291 matching lines @@
     shell_window_contents_->NativeWindowClosed();
   delete this;
 }
 
 void ShellWindow::OnNativeWindowChanged() {
   SaveWindowPosition();
   if (shell_window_contents_ && native_app_window_)
     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 {
   return shell_window_contents_->GetWebContents();
 }
 
 NativeAppWindow* ShellWindow::GetBaseWindow() {
   return native_app_window_.get();
 }
 
@@ skipping 196 matching lines @@
     const extensions::DraggableRegion& region = *iter;
     sk_region->op(
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }