Change browser/page action default icon defined in manifest to support hidpi.

chrome/browser/extensions/extension_icon_image.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/extensions/extension_icon_image.h"
 
 #include <vector>
 
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 110 matching lines @@
   }
 
   // If there is no resource found, bail out and notify observer of failure.
   if (resource.empty()) {
     if (observer_)
       observer_->OnIconImageLoadFailed(this, scale_factor);
     return;
   }
 
   int id = tracker_.next_id();
+<<<<<<< HEAD
   load_map_[id] = scale_factor;
 
+=======
+  load_map_[id].scale_factor = scale_factor;
+  load_map_[id].is_async = false;
+LOG(ERROR) << "load image";
+>>>>>>> 0b2657e... remove default icon test
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   info_list.push_back(ImageLoadingTracker::ImageRepresentation(
       resource,
       ImageLoadingTracker::ImageRepresentation::RESIZE_WHEN_LARGER,
       desired_size_in_dip_.Scale(scale),
       scale_factor));
   tracker_.LoadImages(extension_, info_list, ImageLoadingTracker::DONT_CACHE);
 }
 
 void IconImage::OnImageLoaded(const gfx::Image& image,
                               const std::string& extension_id,
                               int index) {
+LOG(ERROR) << "image loaded";
   LoadMap::iterator load_map_it = load_map_.find(index);
   DCHECK(load_map_it != load_map_.end());
 
   ui::ScaleFactor scale_factor = load_map_it->second;
 
   load_map_.erase(load_map_it);
 
   if (image.IsEmpty()) {
     // There waas an error loading the image.
     if (observer_)
@@ skipping 16 matching lines @@
   DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_UNLOADED);
 
   const Extension* extension =
       content::Details<extensions::UnloadedExtensionInfo>(details)->extension;
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions