Merge 143605 - grd file update for new 2x assets

chrome/browser/extensions/extension_uninstall_dialog.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_uninstall_dialog.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 // Size of extension icon in top left of dialog.
 static const int kIconSize = 69;
 
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Profile* profile,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
@@ skipping 32 matching lines @@
   }
 }
 
 void ExtensionUninstallDialog::OnImageLoaded(const gfx::Image& image,
                                              const std::string& extension_id,
                                              int index) {
   SetIcon(image);
 
   Show();
 }