Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / extension_icon_image.cc

diff --git a/src/extensions/browser/extension_icon_image.cc b/src/extensions/browser/extension_icon_image.cc
index 99473b1..a70924d 100644 (file)
--- a/src/extensions/browser/extension_icon_image.cc
+++ b/src/extensions/browser/extension_icon_image.cc
@@ -7,9 +7,9 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/image_loader.h"
+#include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
@@ -47,11 +47,9 @@ extensions::ExtensionResource GetExtensionIconResource(
     const ExtensionIconSet& icons,
     int size,
     ExtensionIconSet::MatchType match_type) {
-  std::string path = icons.Get(size, match_type);
-  if (path.empty())
-    return extensions::ExtensionResource();
-
-  return extension->GetResource(path);
+  const std::string& path = icons.Get(size, match_type);
+  return path.empty() ? extensions::ExtensionResource()
+                      : extension->GetResource(path);
 }
 
 class BlankImageSource : public gfx::CanvasImageSource {
@@ -150,7 +148,7 @@ IconImage::IconImage(
   image_skia_ = gfx::ImageSkia(source_, resource_size);
 
   registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_REMOVED,
+                 extensions::NOTIFICATION_EXTENSION_REMOVED,
                  content::NotificationService::AllSources());
 }
 
@@ -228,7 +226,7 @@ void IconImage::OnImageLoaded(float scale, const gfx::Image& image_in) {
 void IconImage::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_REMOVED);
+  DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();