Merge grd files in ui/resources and chrome/app/theme

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/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources_standard.h"
+#include "grit/theme_resources.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(
     Browser* browser,
     ExtensionUninstallDialog::Delegate* delegate)
     : browser_(browser),
@@ skipping 58 matching lines @@
   DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSING);
 
   browser_ = NULL;
   if (tracker_.get()) {
     // If we're waiting for the icon, stop doing so because we're not going to
     // show the dialog.
     tracker_.reset();
     delegate_->ExtensionUninstallCanceled();
   }
 }