Merge 143605 - grd file update for new 2x assets

chrome/browser/extensions/app_shortcut_manager.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/app_shortcut_manager.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using extensions::Extension;
 
 namespace {
 // Allow tests to disable shortcut creation, to prevent developers' desktops
 // becoming overrun with shortcuts.
 bool disable_shortcut_creation_for_tests = false;
 
@@ skipping 88 matching lines @@
     }
     info_list.push_back(
         ImageLoadingTracker::ImageInfo(resource, gfx::Size(size, size)));
   }
 
   // |icon_resources| may still be empty at this point, in which case LoadImage
   // will call the OnImageLoaded callback with an empty image and exit
   // immediately.
   tracker_.LoadImages(extension, info_list, ImageLoadingTracker::DONT_CACHE);
 }