Merge 143605 - grd file update for new 2x assets

chrome/browser/extensions/extension_disabled_ui.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_disabled_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 
 namespace {
 
 static base::LazyInstance<
     std::bitset<IDC_EXTENSION_DISABLED_LAST -
                 IDC_EXTENSION_DISABLED_FIRST + 1> >
     menu_command_ids = LAZY_INSTANCE_INITIALIZER;
@@ skipping 273 matching lines @@
       AddGlobalError(new ExtensionDisabledGlobalError(service, extension));
 }
 
 void ShowExtensionDisabledDialog(ExtensionService* service, Browser* browser,
                                  const Extension* extension) {
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(browser, service, extension);
 }
 
 }  // namespace extensions