Move ResourceBundle, DataPack to ui/base

chrome/browser/dom_ui/conflicts_ui.cc

 // Copyright (c) 2010 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/dom_ui/conflicts_ui.h"
 
 #if defined(OS_WIN)
 
 #include <string>
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ConflictsUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class ConflictsUIHTMLSource : public ChromeURLDataManager::DataSource {
@@ skipping 170 matching lines @@
                         make_scoped_refptr(html_source)));
 }
 
 // static
 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
 }
 
 #endif