diff options
348 files changed, 679 insertions, 482 deletions
diff --git a/app/app.gyp b/app/app.gyp index daa2479..a7f4da8 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -47,10 +47,11 @@ '../ui/base/dragdrop/os_exchange_data_win_unittest.cc', '../ui/base/models/tree_node_iterator_unittest.cc', '../ui/base/models/tree_node_model_unittest.cc', + '../ui/base/resource/data_pack_unittest.cc', '../ui/base/system_monitor/system_monitor_unittest.cc', + '../ui/base/test/data/resource.h', '../ui/base/text/text_elider_unittest.cc', '../ui/base/view_prop_unittest.cc', - 'data_pack_unittest.cc', 'l10n_util_mac_unittest.mm', 'l10n_util_unittest.cc', 'run_all_unittests.cc', @@ -58,7 +59,6 @@ 'sql/statement_unittest.cc', 'sql/transaction_unittest.cc', 'test_suite.h', - 'test/data/resource.h', 'win/win_util_unittest.cc', ], 'include_dirs': [ diff --git a/app/app_base.gypi b/app/app_base.gypi index 416932f..e435f9d 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -23,6 +23,10 @@ '../ui/base/system_monitor/system_monitor_mac.mm', '../ui/base/system_monitor/system_monitor_posix.cc', '../ui/base/system_monitor/system_monitor_win.cc', + '../ui/base/ui_base_paths.h', + '../ui/base/ui_base_paths.cc', + '../ui/base/ui_base_switches.h', + '../ui/base/ui_base_switches.cc', 'app_paths.h', 'app_paths.cc', 'app_switches.h', @@ -161,6 +165,14 @@ '../ui/base/models/table_model.cc', '../ui/base/models/table_model.h', '../ui/base/models/table_model_observer.h', + '../ui/base/resource/data_pack.cc', + '../ui/base/resource/data_pack.h', + '../ui/base/resource/resource_bundle.cc', + '../ui/base/resource/resource_bundle.h', + '../ui/base/resource/resource_bundle_linux.cc', + '../ui/base/resource/resource_bundle_mac.mm', + '../ui/base/resource/resource_bundle_posix.cc', + '../ui/base/resource/resource_bundle_win.cc', '../ui/base/text/text_elider.cc', '../ui/base/text/text_elider.h', '../ui/base/theme_provider.cc', @@ -176,8 +188,6 @@ '../ui/base/x/x11_util.cc', '../ui/base/x/x11_util.h', '../ui/base/x/x11_util_internal.h', - 'data_pack.cc', - 'data_pack.h', 'gfx/gl/gl_bindings.h', 'gfx/gl/gl_context.cc', 'gfx/gl/gl_context.h', @@ -207,12 +217,6 @@ 'mac/nsimage_cache.h', 'mac/nsimage_cache.mm', 'mac/scoped_nsdisable_screen_updates.h', - 'resource_bundle.cc', - 'resource_bundle.h', - 'resource_bundle_linux.cc', - 'resource_bundle_mac.mm', - 'resource_bundle_posix.cc', - 'resource_bundle_win.cc', 'sql/connection.cc', 'sql/connection.h', 'sql/diagnostic_error_delegate.h', @@ -322,8 +326,8 @@ '../ui/base/dragdrop/drop_target.cc', '../ui/base/dragdrop/drop_target.h', '../ui/base/dragdrop/os_exchange_data.cc', - 'view_prop.cc', - 'view_prop.h', + '../ui/base/view_prop.cc', + '../ui/base/view_prop.h', 'win/iat_patch_function.cc', 'win/iat_patch_function.h', ], @@ -435,7 +439,7 @@ ], }, 'sources': [ - 'resource_bundle_dummy.cc', + '../ui/base/resource/resource_bundle_dummy.cc', ], 'include_dirs': [ '../skia/config/win', diff --git a/app/app_paths.cc b/app/app_paths.cc index ad10dad..4b0c873 100644 --- a/app/app_paths.cc +++ b/app/app_paths.cc @@ -19,19 +19,6 @@ bool PathProvider(int key, FilePath* result) { FilePath cur; switch (key) { - case app::DIR_LOCALES: - if (!PathService::Get(base::DIR_MODULE, &cur)) - return false; -#if defined(OS_MACOSX) - // On Mac, locale files are in Contents/Resources, a sibling of the - // App dir. - cur = cur.DirName(); - cur = cur.Append(FILE_PATH_LITERAL("Resources")); -#else - cur = cur.Append(FILE_PATH_LITERAL("locales")); -#endif - create_dir = true; - break; case app::DIR_EXTERNAL_EXTENSIONS: if (!PathService::Get(base::DIR_MODULE, &cur)) return false; @@ -46,28 +33,6 @@ bool PathProvider(int key, FilePath* result) { create_dir = true; #endif break; - case app::FILE_RESOURCES_PAK: -#if defined(OS_POSIX) && !defined(OS_MACOSX) - if (!PathService::Get(base::DIR_EXE, &cur)) - return false; - // TODO(tony): We shouldn't be referencing chrome here. - cur = cur.AppendASCII("chrome.pak"); -#else - NOTREACHED(); -#endif - break; - // The following are only valid in the development environment, and - // will fail if executed from an installed executable (because the - // generated path won't exist). - case app::DIR_TEST_DATA: - if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) - return false; - cur = cur.Append(FILE_PATH_LITERAL("app")); - cur = cur.Append(FILE_PATH_LITERAL("test")); - cur = cur.Append(FILE_PATH_LITERAL("data")); - if (!file_util::PathExists(cur)) // we don't want to create this - return false; - break; default: return false; } diff --git a/app/app_paths.h b/app/app_paths.h index f807d60..d1cf12f0 100644 --- a/app/app_paths.h +++ b/app/app_paths.h @@ -14,15 +14,8 @@ namespace app { enum { PATH_START = 2000, - DIR_LOCALES, // Directory where locale resources are stored. DIR_EXTERNAL_EXTENSIONS, // Directory where installer places .crx files. - FILE_RESOURCES_PAK, // Path to the data .pak file which holds binary - // resources. - - // Valid only in development environment; TODO(darin): move these - DIR_TEST_DATA, // Directory where unit test data resides. - PATH_END }; diff --git a/app/app_switches.cc b/app/app_switches.cc index 258b148..59712bf 100644 --- a/app/app_switches.cc +++ b/app/app_switches.cc @@ -9,10 +9,6 @@ namespace switches { // Stop the GPU from synchronizing on the vsync before presenting. const char kDisableGpuVsync[] = "disable-gpu-vsync"; -// The language file that we want to try to open. Of the form -// language[-country] where language is the 2 letter code from ISO-639. -const char kLang[] = "lang"; - // Select which implementation of GL the GPU process should use. Options are: // desktop: whatever desktop OpenGL the user has installed (Linux and Mac // default). diff --git a/app/app_switches.h b/app/app_switches.h index dc5ea8f..f460cf7 100644 --- a/app/app_switches.h +++ b/app/app_switches.h @@ -11,7 +11,6 @@ namespace switches { extern const char kDisableGpuVsync[]; -extern const char kLang[]; extern const char kUseGL[]; } // namespace switches diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 68cc33a..64189e99 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -12,9 +12,7 @@ #include <cstdlib> #include <iterator> -#include "app/app_paths.h" #include "app/l10n_util_collator.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" @@ -28,6 +26,8 @@ #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "gfx/canvas.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #include "unicode/rbbi.h" #include "unicode/uloc.h" @@ -362,7 +362,7 @@ std::string GetApplicationLocale(const std::string& pref_locale) { #else FilePath locale_path; - PathService::Get(app::DIR_LOCALES, &locale_path); + PathService::Get(ui::DIR_LOCALES, &locale_path); std::string resolved_locale; std::vector<std::string> candidates; diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc index 069ad62d..d767c22 100644 --- a/app/l10n_util_unittest.cc +++ b/app/l10n_util_unittest.cc @@ -8,7 +8,6 @@ #include <cstdlib> #endif -#include "app/app_paths.h" #include "app/l10n_util.h" #include "app/l10n_util_collator.h" #if !defined(OS_MACOSX) @@ -26,6 +25,7 @@ #endif #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "ui/base/ui_base_paths.h" #include "unicode/locid.h" namespace { @@ -119,12 +119,12 @@ TEST_F(L10nUtilTest, GetAppLocale) { // Use a temporary locale dir so we don't have to actually build the locale // dlls for this test. FilePath orig_locale_dir; - PathService::Get(app::DIR_LOCALES, &orig_locale_dir); + PathService::Get(ui::DIR_LOCALES, &orig_locale_dir); FilePath new_locale_dir; EXPECT_TRUE(file_util::CreateNewTempDirectory( FILE_PATH_LITERAL("l10n_util_test"), &new_locale_dir)); - PathService::Override(app::DIR_LOCALES, new_locale_dir); + PathService::Override(ui::DIR_LOCALES, new_locale_dir); // Make fake locale files. std::string filenames[] = { "en-US", @@ -278,7 +278,7 @@ TEST_F(L10nUtilTest, GetAppLocale) { #endif // defined(OS_WIN) // Clean up. - PathService::Override(app::DIR_LOCALES, orig_locale_dir); + PathService::Override(ui::DIR_LOCALES, orig_locale_dir); file_util::Delete(new_locale_dir, true); UErrorCode error_code = U_ZERO_ERROR; icu::Locale::setDefault(locale, error_code); diff --git a/app/test_suite.h b/app/test_suite.h index 10e6b44..519f445 100644 --- a/app/test_suite.h +++ b/app/test_suite.h @@ -9,11 +9,12 @@ #include "build/build_config.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/path_service.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" #include "build/build_config.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -38,6 +39,7 @@ class AppTestSuite : public base::TestSuite { TestSuite::Initialize(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); #if defined(OS_MACOSX) // Look in the framework bundle for resources. // TODO(port): make a resource bundle for non-app exes. What's done here @@ -57,8 +59,8 @@ class AppTestSuite : public base::TestSuite { FilePath pak_dir; PathService::Get(base::DIR_MODULE, &pak_dir); pak_dir = pak_dir.AppendASCII("app_unittests_strings"); - PathService::Override(app::DIR_LOCALES, pak_dir); - PathService::Override(app::FILE_RESOURCES_PAK, + PathService::Override(ui::DIR_LOCALES, pak_dir); + PathService::Override(ui::FILE_RESOURCES_PAK, pak_dir.AppendASCII("app_resources.pak")); #endif diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 7507f8b..6bf80cc 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -4,7 +4,6 @@ #include "app/app_paths.h" #include "app/app_switches.h" -#include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug/debugger.h" @@ -36,6 +35,9 @@ #include "chrome/common/set_process_title.h" #include "chrome/common/url_constants.h" #include "ipc/ipc_switches.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" +#include "ui/base/ui_base_switches.h" #if defined(OS_WIN) #include <algorithm> @@ -717,6 +719,7 @@ int ChromeMain(int argc, char** argv) { // Initialize the Chrome path provider. app::RegisterPathProvider(); + ui::RegisterPathProvider(); chrome::RegisterPathProvider(); // Notice a user data directory override if any diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index b2496ee..4d83a65 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -5,7 +5,6 @@ #include "chrome/browser/alternate_nav_url_fetcher.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request.h" +#include "ui/base/resource/resource_bundle.h" AlternateNavURLFetcher::AlternateNavURLFetcher( const GURL& alternate_nav_url) diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index ba9736a..508bfc5 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -7,7 +7,6 @@ #include <Carbon/Carbon.h> // kVK_Return #include "app/mac/nsimage_cache.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -24,6 +23,7 @@ #include "net/base/escape.h" #import "third_party/mozilla/NSPasteboard+Utils.h" #include "ui/base/clipboard/clipboard.h" +#include "ui/base/resource/resource_bundle.h" // Focus-handling between |field_| and |model_| is a bit subtle. // Other platforms detect change of focus, which is inconvenient diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index 3884bbb..893c40b 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -6,7 +6,6 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc index 04f9227..6588c46 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc @@ -5,7 +5,6 @@ #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/metrics/histogram.h" #include "chrome/browser/autofill/autofill_cc_infobar.h" #include "chrome/browser/autofill/autofill_manager.h" @@ -16,6 +15,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" AutoFillCCInfoBarDelegate::AutoFillCCInfoBarDelegate(TabContents* tab_contents, AutoFillManager* host) diff --git a/chrome/browser/autofill/autofill_cc_infobar_win.cc b/chrome/browser/autofill/autofill_cc_infobar_win.cc index 16004da..db44274 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_win.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/autofill/autofill_cc_infobar.h" -#include "app/resource_bundle.h" #include "chrome/browser/ui/views/event_utils.h" #include "chrome/browser/ui/views/infobars/infobars.h" #include "chrome/browser/ui/views/infobars/infobar_text_button.h" @@ -12,6 +11,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" #include "views/controls/link.h" diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm index 892160f..a20e534 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm @@ -4,7 +4,6 @@ #import "chrome/browser/autofill/autofill_dialog_controller_mac.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/lazy_instance.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/autofill/autofill_editor_gtk.cc b/chrome/browser/autofill/autofill_editor_gtk.cc index d7b2a84..7d8281f 100644 --- a/chrome/browser/autofill/autofill_editor_gtk.cc +++ b/chrome/browser/autofill/autofill_editor_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/task.h" @@ -23,6 +22,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index 1ba3270..60b0f43 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -5,7 +5,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/logging.h" @@ -27,6 +26,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" void BackgroundModeManager::OnApplicationDataChanged( const Extension* extension) { diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index e094eb5..295189f 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" @@ -55,6 +54,7 @@ #include "grit/locale_settings.h" #include "webkit/glue/webkit_glue.h" #include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" #ifdef CHROME_V8 #include "v8/include/v8.h" #endif diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fea615c..ed8764c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug/trace_event.h" @@ -102,6 +101,7 @@ #include "net/spdy/spdy_session_pool.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_throttler_manager.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/system_monitor/system_monitor.h" #if defined(USE_LINUX_BREAKPAD) diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index fa88bc8..57b33e5 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -8,7 +8,6 @@ #include "app/app_switches.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/file_path.h" @@ -27,6 +26,7 @@ #include "chrome/common/main_function_params.h" #include "chrome/common/result_codes.h" #include "net/socket/ssl_client_socket_mac_factory.h" +#include "ui/base/resource/resource_bundle.h" void DidEndMainMessageLoop() { AppController* appController = [NSApp delegate]; diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 43088d5..2849261 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" @@ -39,6 +38,7 @@ #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/switch_utils.h" #include "net/predictor_api.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "chrome/browser/rlz/rlz.h" diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc index 535dcd5..6b36407 100644 --- a/chrome/browser/browser_signin.cc +++ b/chrome/browser/browser_signin.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/resource_bundle.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop.h" @@ -32,6 +31,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" +#include "ui/base/resource/resource_bundle.h" class BrowserSigninResourcesSource : public ChromeURLDataManager::DataSource { public: diff --git a/chrome/browser/chromeos/brightness_bubble.cc b/chrome/browser/chromeos/brightness_bubble.cc index 5299e4b..11664e5 100644 --- a/chrome/browser/chromeos/brightness_bubble.cc +++ b/chrome/browser/chromeos/brightness_bubble.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/brightness_bubble.h" -#include "app/resource_bundle.h" #include "base/singleton.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index bd08dd3..5a5da77 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -27,7 +26,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" - +#include "ui/base/resource/resource_bundle.h" //////////////////////////////////////////////////////////////////////////////// // diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index 1b37cea..d992ba4 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/base64.h" #include "base/basictypes.h" #include "base/callback.h" @@ -34,8 +33,9 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "views/window/window.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" +#include "views/window/window.h" static const char kOtherNetworksFakePath[] = "?"; diff --git a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc index d168190..2630d4c 100644 --- a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc +++ b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/values.h" #include "base/weak_ptr.h" @@ -19,6 +18,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/cros/chromeos_input_method.h" +#include "ui/base/resource/resource_bundle.h" class KeyboardOverlayUIHTMLSource : public ChromeURLDataManager::DataSource { diff --git a/chrome/browser/chromeos/dom_ui/login/login_ui_helpers.cc b/chrome/browser/chromeos/dom_ui/login/login_ui_helpers.cc index c0d05d0..3cf1d52 100644 --- a/chrome/browser/chromeos/dom_ui/login/login_ui_helpers.cc +++ b/chrome/browser/chromeos/dom_ui/login/login_ui_helpers.cc @@ -5,7 +5,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/file_path.h" #include "base/path_service.h" #include "base/values.h" @@ -18,6 +17,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "grit/browser_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc index 08b6440..2d362d3 100644 --- a/chrome/browser/chromeos/dom_ui/menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/json/json_writer.h" @@ -32,6 +31,7 @@ #include "grit/app_resources.h" #include "grit/browser_resources.h" #include "ui/base/models/menu_model.h" +#include "ui/base/resource/resource_bundle.h" #include "views/accelerator.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/radio_button_image_gtk.h" diff --git a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc index e1dbd7a..10ebbcd 100644 --- a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc +++ b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/file_util.h" #include "base/json/json_reader.h" @@ -39,6 +38,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/dom_ui/proxy_handler.cc b/chrome/browser/chromeos/dom_ui/proxy_handler.cc index 759d8bd..be7f5d8 100644 --- a/chrome/browser/chromeos/dom_ui/proxy_handler.cc +++ b/chrome/browser/chromeos/dom_ui/proxy_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/proxy_handler.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/stl_util-inl.h" @@ -18,6 +17,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/register_page_ui.cc b/chrome/browser/chromeos/dom_ui/register_page_ui.cc index 1778490..3d863be 100644 --- a/chrome/browser/chromeos/dom_ui/register_page_ui.cc +++ b/chrome/browser/chromeos/dom_ui/register_page_ui.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/logging.h" #include "base/string_piece.h" @@ -26,6 +25,7 @@ #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/dom_ui/system_info_ui.cc b/chrome/browser/chromeos/dom_ui/system_info_ui.cc index 71f9865..500e59d 100644 --- a/chrome/browser/chromeos/dom_ui/system_info_ui.cc +++ b/chrome/browser/chromeos/dom_ui/system_info_ui.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/system_info_ui.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -29,6 +28,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" class SystemInfoUIHTMLSource : public ChromeURLDataManager::DataSource { public: diff --git a/chrome/browser/chromeos/frame/bubble_frame_view.cc b/chrome/browser/chromeos/frame/bubble_frame_view.cc index d12206d..9086c82 100644 --- a/chrome/browser/chromeos/frame/bubble_frame_view.cc +++ b/chrome/browser/chromeos/frame/bubble_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/frame/bubble_frame_view.h" -#include "app/resource_bundle.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "gfx/insets.h" @@ -14,6 +13,7 @@ #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/ui/views/bubble_border.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 5770c87..ac92244 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/singleton.h" @@ -21,6 +20,7 @@ #include "third_party/cros/chromeos_wm_ipc_enums.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window_main.cc b/chrome/browser/chromeos/input_method/candidate_window_main.cc index 1d6ff43..4e54cf0 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_main.cc +++ b/chrome/browser/chromeos/input_method/candidate_window_main.cc @@ -10,7 +10,6 @@ #include "app/app_paths.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -21,6 +20,8 @@ #include "chrome/common/chrome_switches.h" #include "grit/app_locale_settings.h" #include "third_party/cros/chromeos_cros_api.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #include "views/focus/accelerator_handler.h" int main(int argc, char** argv) { @@ -33,6 +34,7 @@ int main(int argc, char** argv) { base::AtExitManager exit_manager; base::EnableTerminationOnHeapCorruption(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); CommandLine::Init(argc, argv); // Check if the UI language code is passed from the command line, diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index b2da474..4474326 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string16.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -34,6 +33,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index 12e36d3..5cb76ae 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/message_loop.h" #include "base/task.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 0ec0718..e261b7d 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -9,7 +9,6 @@ #include <map> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" @@ -38,6 +37,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/screen.h" #include "views/widget/widget_gtk.h" #include "views/window/window.h" diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 14fc92b..38813c4 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/login/helper.h" -#include "app/resource_bundle.h" #include "chrome/browser/google/google_util.h" #include "gfx/canvas_skia.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index c94182e..c8bd42f 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/language_switch_menu.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -16,6 +15,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 8105f7a..ad89594 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" @@ -26,6 +25,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc index 515b7be..cbc6f35 100644 --- a/chrome/browser/chromeos/login/login_screen.cc +++ b/chrome/browser/chromeos/login/login_screen.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/login_screen.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/logging.h" @@ -25,6 +24,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index da2415a..f3d5cec 100644 --- a/chrome/browser/chromeos/login/message_bubble.cc +++ b/chrome/browser/chromeos/login/message_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/login/message_bubble.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/chromeos/login/helper.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc index 6c8fcea..45c6bdf 100644 --- a/chrome/browser/chromeos/login/network_screen.cc +++ b/chrome/browser/chromeos/login/network_screen.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/network_screen.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -16,6 +15,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/menu/menu_2.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc index f4eb223..a62ce07 100644 --- a/chrome/browser/chromeos/login/network_selection_view.cc +++ b/chrome/browser/chromeos/login/network_selection_view.cc @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/keyboard_switch_menu.h" @@ -23,6 +22,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/throbber.h" #include "views/fill_layout.h" diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc index f458a86..cf803bb 100644 --- a/chrome/browser/chromeos/login/new_user_view.cc +++ b/chrome/browser/chromeos/login/new_user_view.cc @@ -11,7 +11,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -29,6 +28,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/throbber.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/login/oobe_progress_bar.cc b/chrome/browser/chromeos/login/oobe_progress_bar.cc index 5eafe52..24ab9ee 100644 --- a/chrome/browser/chromeos/login/oobe_progress_bar.cc +++ b/chrome/browser/chromeos/login/oobe_progress_bar.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/login/oobe_progress_bar.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index 8cb01d5..38c4fc8 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/login/password_changed_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" #include "views/grid_layout.h" diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index 4508501..85377c2 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/screen_lock_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/chromeos/login/screen_locker.h" @@ -19,6 +18,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/border.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 152f402..d329ba1 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -13,7 +13,6 @@ #undef Status #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" @@ -48,6 +47,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #include "views/screen.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc index 1af583a..168cf60 100644 --- a/chrome/browser/chromeos/login/shutdown_button.cc +++ b/chrome/browser/chromeos/login/shutdown_button.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/shutdown_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/power_library.h" @@ -14,6 +13,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" namespace { diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc index 7a56be2..0e56cec 100644 --- a/chrome/browser/chromeos/login/update_view.cc +++ b/chrome/browser/chromeos/login/update_view.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" @@ -15,6 +14,7 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/border.h" #include "views/controls/label.h" #include "views/controls/progress_bar.h" diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index 09f737f..773391d 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" @@ -25,6 +24,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/user_image_screen.cc b/chrome/browser/chromeos/login/user_image_screen.cc index 3c0abff..1bd761f 100644 --- a/chrome/browser/chromeos/login/user_image_screen.cc +++ b/chrome/browser/chromeos/login/user_image_screen.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/user_image_screen.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/time.h" #include "chrome/browser/chromeos/login/login_utils.h" @@ -15,6 +14,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc index b8545cf..a689c53 100644 --- a/chrome/browser/chromeos/login/user_image_view.cc +++ b/chrome/browser/chromeos/login/user_image_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" @@ -18,6 +17,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index 4c325c2..38de932 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/user_manager.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_type.h" #include "gfx/codec/png_codec.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index b93eaf3..184da51 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/user_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" @@ -16,6 +15,7 @@ #include "gfx/rect.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 1bd24ac..e94ff1c 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/web_page_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/logging.h" #include "base/string_util.h" @@ -22,6 +21,7 @@ #include "grit/theme_resources.h" #include "ipc/ipc_message.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/border.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index d784593..8362593 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -11,7 +11,6 @@ #include <string> #include <vector> -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" @@ -49,6 +48,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/timezone.h" #include "views/accelerator.h" #include "views/painter.h" diff --git a/chrome/browser/chromeos/native_theme_chromeos.cc b/chrome/browser/chromeos/native_theme_chromeos.cc index ff1d10f..945f3a6 100644 --- a/chrome/browser/chromeos/native_theme_chromeos.cc +++ b/chrome/browser/chromeos/native_theme_chromeos.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/native_theme_chromeos.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "gfx/insets.h" #include "gfx/rect.h" @@ -15,6 +14,7 @@ #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 63cc00d..d4c5b1e 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/notifications/balloon_view_host.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index a60705b..04f0899 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -9,7 +9,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" #include "chrome/browser/chromeos/notifications/balloon_view.h" #include "chrome/common/notification_details.h" @@ -17,6 +16,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/native/native_view_host.h" #include "views/controls/scroll_view.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index e466d75f..6f00786 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/offline/offline_load_page.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -28,6 +27,7 @@ #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc index 3e56fd0..5601e34 100644 --- a/chrome/browser/chromeos/options/internet_page_view.cc +++ b/chrome/browser/chromeos/options/internet_page_view.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/controls/combobox/combobox.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/chromeos/options/settings_page_view.cc b/chrome/browser/chromeos/options/settings_page_view.cc index b4b9d73..15be561 100644 --- a/chrome/browser/chromeos/options/settings_page_view.cc +++ b/chrome/browser/chromeos/options/settings_page_view.cc @@ -5,10 +5,10 @@ #include "chrome/browser/chromeos/options/settings_page_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/skia_utils_gtk.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/fill_layout.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 2f2740e..413b13c 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/options/wifi_config_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.cc b/chrome/browser/chromeos/panels/panel_scroller_header.cc index d4ef8fb..08c9424 100644 --- a/chrome/browser/chromeos/panels/panel_scroller_header.cc +++ b/chrome/browser/chromeos/panels/panel_scroller_header.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/panels/panel_scroller_header.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/panels/panel_scroller.h" #include "gfx/canvas.h" #include "gfx/font.h" +#include "ui/base/resource/resource_bundle.h" PanelScrollerHeader::PanelScrollerHeader(PanelScroller* scroller) : views::View(), diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 44742d8..044c540 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/status/clock_menu_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" #include "base/time.h" @@ -15,6 +14,7 @@ #include "gfx/canvas.h" #include "gfx/font.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index aa046ba..7d98b23 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" @@ -24,6 +23,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" // The language menu consists of 3 parts (in this order): // diff --git a/chrome/browser/chromeos/status/input_method_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc index ab5987c..9ad5f4e 100644 --- a/chrome/browser/chromeos/status/input_method_menu_button.cc +++ b/chrome/browser/chromeos/status/input_method_menu_button.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/keyboard_library.h" @@ -14,6 +13,7 @@ #include "chrome/browser/chromeos/status/status_area_host.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/status/network_dropdown_button.cc b/chrome/browser/chromeos/status/network_dropdown_button.cc index 8244df4..b989e6a 100644 --- a/chrome/browser/chromeos/status/network_dropdown_button.cc +++ b/chrome/browser/chromeos/status/network_dropdown_button.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/status/network_dropdown_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" @@ -13,6 +12,7 @@ #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/window/window.h" namespace chromeos { diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 66ea92f..11d47a9 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/menu/menu_2.h" #include "views/window/window.h" diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 7e7bdd0..dff4a98 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -8,7 +8,6 @@ #include <limits> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -17,6 +16,7 @@ #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/window/window.h" namespace chromeos { diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 1ae0d43..20f77e6 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/status/power_menu_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -13,6 +12,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/views/dropdown_button.cc b/chrome/browser/chromeos/views/dropdown_button.cc index 58e9d368..f117203 100644 --- a/chrome/browser/chromeos/views/dropdown_button.cc +++ b/chrome/browser/chromeos/views/dropdown_button.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "chrome/browser/chromeos/views/dropdown_button.h" #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { // Asset icon particularities makes us offset focus frame. diff --git a/chrome/browser/chromeos/volume_bubble.cc b/chrome/browser/chromeos/volume_bubble.cc index ec9d365..f081c09 100644 --- a/chrome/browser/chromeos/volume_bubble.cc +++ b/chrome/browser/chromeos/volume_bubble.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/volume_bubble.h" -#include "app/resource_bundle.h" #include "base/singleton.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index a840eb5..4618549 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/linked_ptr.h" #include "base/string_util.h" @@ -23,6 +22,7 @@ #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request_context.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" static const char kFileOriginNodeName[] = "file://"; diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index 05d6788..b5a0269 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -5,7 +5,6 @@ #include "chrome/browser/custom_home_pages_table_model.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -22,6 +21,7 @@ #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model_observer.h" +#include "ui/base/resource/resource_bundle.h" struct CustomHomePagesTableModel::Entry { Entry() : title_handle(0), fav_icon_handle(0) {} diff --git a/chrome/browser/diagnostics/diagnostics_main.cc b/chrome/browser/diagnostics/diagnostics_main.cc index 059dd59..6cbcb28 100644 --- a/chrome/browser/diagnostics/diagnostics_main.cc +++ b/chrome/browser/diagnostics/diagnostics_main.cc @@ -21,6 +21,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/diagnostics/diagnostics_model.h" #include "chrome/common/chrome_paths.h" +#include "ui/base/ui_base_paths.h" namespace { // This is a minimalistic interface to wrap the platform console. This will be @@ -343,6 +344,7 @@ int DiagnosticsMain(const CommandLine& command_line) { // We need to have the path providers registered. They both // return void so there is no early error signal that we can use. app::RegisterPathProvider(); + ui::RegisterPathProvider(); chrome::RegisterPathProvider(); TestWriter writer(console); diff --git a/chrome/browser/dom_ui/bookmarks_ui.cc b/chrome/browser/dom_ui/bookmarks_ui.cc index 1875d45..b615168 100644 --- a/chrome/browser/dom_ui/bookmarks_ui.cc +++ b/chrome/browser/dom_ui/bookmarks_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/bookmarks_ui.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/ref_counted_memory.h" #include "base/singleton.h" @@ -12,6 +11,7 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" //////////////////////////////////////////////////////////////////////////////// // diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index bd4bd15..2dc2a80 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/logging.h" #include "base/message_loop.h" @@ -31,11 +30,11 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "gfx/rect.h" - #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" #if defined(USE_X11) #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index 9f4df7d..82745de 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.cc @@ -9,7 +9,6 @@ #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" @@ -26,6 +25,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index 565d4ed..b3c8a39 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -4,11 +4,11 @@ #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" +#include "ui/base/resource/resource_bundle.h" DOMUIFavIconSource::DOMUIFavIconSource(Profile* profile) : DataSource(chrome::kChromeUIFavIconHost, MessageLoop::current()), diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc index f8238e4..808712d 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/dom_ui_theme_source.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/ref_counted_memory.h" #include "chrome/browser/browser_thread.h" @@ -14,6 +13,7 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" // use a resource map rather than hard-coded strings. diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc index b43a9e9..91ce8c9 100644 --- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc +++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc @@ -4,13 +4,13 @@ #include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/history/top_sites.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" DOMUIThumbnailSource::DOMUIThumbnailSource(Profile* profile) : DataSource(chrome::kChromeUIThumbnailPath, MessageLoop::current()), diff --git a/chrome/browser/dom_ui/dom_ui_util.cc b/chrome/browser/dom_ui/dom_ui_util.cc index a5d36e4..6f0c160 100644 --- a/chrome/browser/dom_ui/dom_ui_util.cc +++ b/chrome/browser/dom_ui/dom_ui_util.cc @@ -6,11 +6,11 @@ #include <vector> -#include "app/resource_bundle.h" #include "base/base64.h" #include "base/logging.h" #include "base/values.h" #include "gfx/codec/png_codec.h" +#include "ui/base/resource/resource_bundle.h" namespace dom_ui_util { diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 2ef2656..527ca90 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -5,7 +5,6 @@ #include "chrome/browser/dom_ui/downloads_ui.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/threading/thread.h" @@ -21,6 +20,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc index 17375df..ceaa65c 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.cc +++ b/chrome/browser/dom_ui/filebrowse_ui.cc @@ -5,7 +5,6 @@ #include "chrome/browser/dom_ui/filebrowse_ui.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_util.h" @@ -48,6 +47,7 @@ #include "grit/locale_settings.h" #include "net/base/escape.h" #include "net/url_request/url_request_file_job.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/dom_ui/flags_ui.cc b/chrome/browser/dom_ui/flags_ui.cc index 76d4bdd..bd70d028 100644 --- a/chrome/browser/dom_ui/flags_ui.cc +++ b/chrome/browser/dom_ui/flags_ui.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/singleton.h" #include "base/values.h" #include "chrome/browser/about_flags.h" @@ -24,6 +23,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/gpu_internals_ui.cc b/chrome/browser/dom_ui/gpu_internals_ui.cc index 9b93bfb..09a79f3 100644 --- a/chrome/browser/dom_ui/gpu_internals_ui.cc +++ b/chrome/browser/dom_ui/gpu_internals_ui.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -39,7 +38,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" - +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index 89b3b7c..2847510 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -8,7 +8,6 @@ #include <set> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -34,13 +33,13 @@ #include "chrome/common/notification_source.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "net/base/escape.h" - #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" // Maximum number of search results to return in a given search. We should // eventually remove this. diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index c599a76..e9c5029 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -8,7 +8,6 @@ #include <set> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -34,13 +33,13 @@ #include "chrome/common/notification_source.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" -#include "net/base/escape.h" - #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" // Maximum number of search results to return in a given search. We should // eventually remove this. diff --git a/chrome/browser/dom_ui/keyboard_ui.cc b/chrome/browser/dom_ui/keyboard_ui.cc index 9fddd04..413cb0d 100644 --- a/chrome/browser/dom_ui/keyboard_ui.cc +++ b/chrome/browser/dom_ui/keyboard_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/keyboard_ui.h" -#include "app/resource_bundle.h" #include "base/ref_counted_memory.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -12,6 +11,7 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" +#include "ui/base/resource/resource_bundle.h" /////////////////////////////////////////////////////////////////////////////// // KeyboardUI diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index 2f1cec7..ee83467 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/mediaplayer_ui.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" @@ -42,6 +41,7 @@ #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_job.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/frame/panel_browser_view.h" diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc index c2706bc..0cc5af5 100644 --- a/chrome/browser/dom_ui/net_internals_ui.cc +++ b/chrome/browser/dom_ui/net_internals_ui.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -48,6 +47,8 @@ #include "net/http/http_network_session.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" +#include "ui/base/resource/resource_bundle.h" + #ifdef OS_WIN #include "chrome/browser/net/service_providers_win.h" #endif diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index b94b4cd..9528d6d 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/ref_counted_memory.h" @@ -40,6 +39,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/animation/animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #if defined(OS_WIN) || defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/dom_ui/options/about_page_handler.cc b/chrome/browser/dom_ui/options/about_page_handler.cc index 8100392..aada884 100644 --- a/chrome/browser/dom_ui/options/about_page_handler.cc +++ b/chrome/browser/dom_ui/options/about_page_handler.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" @@ -27,6 +26,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webkit_glue.h" #if defined(CHROME_V8) diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 5cd50d0..06353ac 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -52,6 +51,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h" diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index aaf59f1..377dc98 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/singleton.h" @@ -32,6 +31,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/plugin_list.h" namespace { diff --git a/chrome/browser/dom_ui/print_preview_ui.cc b/chrome/browser/dom_ui/print_preview_ui.cc index f0f7656..23f1052 100644 --- a/chrome/browser/dom_ui/print_preview_ui.cc +++ b/chrome/browser/dom_ui/print_preview_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -19,10 +18,10 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" - #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/remoting_ui.cc b/chrome/browser/dom_ui/remoting_ui.cc index 0bdb717..f3e0899 100644 --- a/chrome/browser/dom_ui/remoting_ui.cc +++ b/chrome/browser/dom_ui/remoting_ui.cc @@ -4,12 +4,12 @@ #include "chrome/browser/dom_ui/remoting_ui.h" -#include "app/resource_bundle.h" #include "base/singleton.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/shared_resources_data_source.cc b/chrome/browser/dom_ui/shared_resources_data_source.cc index 709b33c..063e05c 100644 --- a/chrome/browser/dom_ui/shared_resources_data_source.cc +++ b/chrome/browser/dom_ui/shared_resources_data_source.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/resource_bundle.h" #include "base/singleton.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_thread.h" @@ -19,6 +18,7 @@ #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "net/base/mime_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc index a086372..73aed3d 100644 --- a/chrome/browser/dom_ui/slideshow_ui.cc +++ b/chrome/browser/dom_ui/slideshow_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/slideshow_ui.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -25,13 +24,13 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" -#include "net/base/escape.h" -#include "net/base/directory_lister.h" - #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "net/base/escape.h" +#include "net/base/directory_lister.h" +#include "ui/base/resource/resource_bundle.h" static const char kPropertyPath[] = "path"; static const char kPropertyTitle[] = "title"; diff --git a/chrome/browser/dom_ui/sync_internals_html_source.cc b/chrome/browser/dom_ui/sync_internals_html_source.cc index 456c93f..c35aaab 100644 --- a/chrome/browser/dom_ui/sync_internals_html_source.cc +++ b/chrome/browser/dom_ui/sync_internals_html_source.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/ref_counted_memory.h" @@ -15,6 +14,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "grit/sync_internals_resources.h" +#include "ui/base/resource/resource_bundle.h" SyncInternalsHTMLSource::SyncInternalsHTMLSource() : DataSource(chrome::kChromeUISyncInternalsHost, diff --git a/chrome/browser/dom_ui/textfields_ui.cc b/chrome/browser/dom_ui/textfields_ui.cc index a74f10d..34a2ab5 100644 --- a/chrome/browser/dom_ui/textfields_ui.cc +++ b/chrome/browser/dom_ui/textfields_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <string> -#include "app/resource_bundle.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/values.h" @@ -15,6 +14,7 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" +#include "ui/base/resource/resource_bundle.h" /** * TextfieldsUIHTMLSource implementation. diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 014f01c..de7344a 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -5,7 +5,6 @@ #include "chrome/browser/download/download_manager.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/file_util.h" #include "base/logging.h" @@ -46,6 +45,7 @@ #include "grit/theme_resources.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" DownloadManager::DownloadManager(DownloadStatusUpdater* status_updater) : shutdown_needed_(false), diff --git a/chrome/browser/download/download_request_infobar_delegate.cc b/chrome/browser/download/download_request_infobar_delegate.cc index ecbc108..417dfa4 100644 --- a/chrome/browser/download/download_request_infobar_delegate.cc +++ b/chrome/browser/download/download_request_infobar_delegate.cc @@ -5,10 +5,10 @@ #include "chrome/browser/download/download_request_infobar_delegate.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" DownloadRequestInfoBarDelegate::DownloadRequestInfoBarDelegate(TabContents* tab, DownloadRequestLimiter::TabDownloadState* host) diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 9b57af2c..eadebbb 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -12,7 +12,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" @@ -54,6 +53,7 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #if defined(TOOLKIT_VIEWS) #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/chrome/browser/extensions/crashed_extension_infobar.cc b/chrome/browser/extensions/crashed_extension_infobar.cc index fbed6e6..1077d44 100644 --- a/chrome/browser/extensions/crashed_extension_infobar.cc +++ b/chrome/browser/extensions/crashed_extension_infobar.cc @@ -5,13 +5,13 @@ #include "chrome/browser/extensions/crashed_extension_infobar.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" CrashedExtensionInfoBarDelegate::CrashedExtensionInfoBarDelegate( TabContents* tab_contents, diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index de4804f..4becbdd 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -7,7 +7,6 @@ #include <set> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/path_service.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 9ef6136..c5f55a0 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -7,7 +7,6 @@ #include <list> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/singleton.h" #include "base/metrics/histogram.h" @@ -48,6 +47,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/context_menu.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index 887dc3ff..e0af4fb 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_icon_manager.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/common/extensions/extension.h" @@ -17,6 +16,7 @@ #include "gfx/size.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 5b343e6..94b5ada 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -7,7 +7,6 @@ #include <map> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" @@ -31,6 +30,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index faa7ae9..1ee6952 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/file_path.h" #include "base/logging.h" #include "base/message_loop.h" @@ -29,6 +28,7 @@ #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_simple_job.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index a800ec1..8ae7d3c 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/base64.h" #include "base/callback.h" #include "base/file_util.h" @@ -54,6 +53,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/image_decoder.h" namespace { diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 5f47084..3656175 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate( TabContents* tab_contents, diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc index 37d1754..85f072d 100644 --- a/chrome/browser/first_run/first_run_gtk.cc +++ b/chrome/browser/first_run/first_run_gtk.cc @@ -20,6 +20,7 @@ #include "chrome/common/result_codes.h" #include "chrome/installer/util/google_update_settings.h" #include "googleurl/src/gurl.h" +#include "ui/base/ui_base_switches.h" // TODO(port): This is just a piece of the silent import functionality from // ImportSettings for Windows. It would be nice to get the rest of it ported. diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 179e43b..b50317b 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -13,7 +13,6 @@ #include "app/app_switches.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/environment.h" #include "base/file_util.h" #include "base/path_service.h" @@ -58,6 +57,8 @@ #include "views/widget/root_view.h" #include "views/widget/widget_win.h" #include "views/window/window.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_switches.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 77c00eb..f698ec4 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_service.h" @@ -30,6 +29,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc index 332d23a..a99db71 100644 --- a/chrome/browser/gpu_process_host.cc +++ b/chrome/browser/gpu_process_host.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gpu_process_host.h" #include "app/app_switches.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -27,6 +26,7 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" #include "media/base/media_switches.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_LINUX) // These two #includes need to come after render_messages.h. diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index a60c9b1..c1366c5 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -5,7 +5,6 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/metrics/histogram.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" @@ -37,6 +36,7 @@ #include "grit/theme_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" +#include "ui/base/resource/resource_bundle.h" using WebKit::WebNotificationPresenter; using WebKit::WebTextDirection; diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 4822cc8..ebd32fc 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -5,7 +5,6 @@ #include "chrome/browser/omnibox_search_hint.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/task.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" // The URLs of search engines for which we want to trigger the infobar. const char* kSearchEngineURLs[] = { diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index 122d8a8..2bdbbfe 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" @@ -21,6 +20,7 @@ #include "net/base/ssl_connection_status_flags.h" #include "net/base/ssl_cipher_suite_names.h" #include "net/base/x509_certificate.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/chrome/browser/password_manager_delegate_impl.cc b/chrome/browser/password_manager_delegate_impl.cc index 466ee34..1660709 100644 --- a/chrome/browser/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager_delegate_impl.cc @@ -5,7 +5,6 @@ #include "chrome/browser/password_manager_delegate_impl.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/metrics/histogram.h" #include "base/singleton.h" #include "chrome/browser/password_manager/password_form_manager.h" @@ -16,6 +15,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/password_form.h" // After a successful *new* login attempt, we take the PasswordFormManager in diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index 8d63679..1ba83b9 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -5,13 +5,13 @@ #include "chrome/browser/plugin_installer.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/default_plugin_shared.h" // The URL for the "Problems installing" page for the Plugins infobar. diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 6ab2aae..457d8d1 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -42,6 +42,7 @@ #include "net/base/io_buffer.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" +#include "ui/base/ui_base_switches.h" #if defined(USE_X11) #include "gfx/gtk_native_view_id_manager.h" diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 068a793..d1226b9 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/possible_url_model.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/string_util.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model_observer.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" using base::Time; diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 4a386d6..148616e 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -10,6 +10,7 @@ #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "ui/base/ui_base_switches.h" const CommandLinePrefStore::StringSwitchToPreferenceMapEntry CommandLinePrefStore::string_switch_map_[] = { diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc index 1be9c0a..790f52b 100644 --- a/chrome/browser/prefs/command_line_pref_store_unittest.cc +++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "ui/base/ui_base_switches.h" namespace { diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index adf7083..01ff8b1 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -19,6 +18,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" // Define the values of standard URLs. const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] = diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index 3b13b59..488ca6e 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" @@ -38,6 +37,7 @@ #include "grit/browser_resources.h" #include "grit/locale_settings.h" #include "net/base/transport_security_state.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/database/database_tracker.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index b235eb1..3b540d1 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -4,7 +4,6 @@ #include "chrome/browser/profiles/profile_impl.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/environment.h" #include "base/file_path.h" @@ -93,6 +92,7 @@ #include "grit/browser_resources.h" #include "grit/locale_settings.h" #include "net/base/transport_security_state.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/database/database_tracker.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc index 00a6d97..fab4639 100644 --- a/chrome/browser/remoting/remoting_resources_source.cc +++ b/chrome/browser/remoting/remoting_resources_source.cc @@ -8,7 +8,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -20,6 +19,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" // Define the values of standard URLs. const char RemotingResourcesSource::kInvalidPasswordHelpUrl[] = diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 9577d60..26b3f4c 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -93,6 +93,7 @@ #include "ipc/ipc_platform_file.h" #include "ipc/ipc_switches.h" #include "media/base/media_switches.h" +#include "ui/base/ui_base_switches.h" #include "webkit/fileapi/file_system_path_manager.h" #include "webkit/plugins/plugin_switches.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 57ac721..021c19b 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -8,7 +8,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" @@ -40,6 +39,7 @@ #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" #include "views/accessibility/view_accessibility.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 35a5abb..4b059c3 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/string_number_conversions.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/escape.h" +#include "ui/base/resource/resource_bundle.h" // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc index 18c239d..ddcd561 100644 --- a/chrome/browser/search_engines/template_url_table_model.cc +++ b/chrome/browser/search_engines/template_url_table_model.cc @@ -5,7 +5,6 @@ #include "chrome/browser/search_engines/template_url_table_model.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/stl_util-inl.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model_observer.h" +#include "ui/base/resource/resource_bundle.h" // Group IDs used by TemplateURLTableModel. static const int kMainGroupID = 0; diff --git a/chrome/browser/speech/speech_input_bubble.cc b/chrome/browser/speech/speech_input_bubble.cc index 77619e9..eb5b82e 100644 --- a/chrome/browser/speech/speech_input_bubble.cc +++ b/chrome/browser/speech/speech_input_bubble.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/speech/speech_input_bubble.h" #include "gfx/canvas_skia.h" #include "gfx/rect.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" SpeechInputBubble::FactoryMethod SpeechInputBubble::factory_ = NULL; const int SpeechInputBubble::kBubbleTargetOffsetX = 5; diff --git a/chrome/browser/speech/speech_input_bubble_gtk.cc b/chrome/browser/speech/speech_input_bubble_gtk.cc index b8bed6d..43b6c07 100644 --- a/chrome/browser/speech/speech_input_bubble_gtk.cc +++ b/chrome/browser/speech/speech_input_bubble_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/speech/speech_input_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" @@ -16,6 +15,7 @@ #include "gfx/rect.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index c727b09..404dfb6 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -5,7 +5,6 @@ #include "chrome/browser/speech/speech_input_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -15,6 +14,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 055f7b3..59a6447 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ssl/ssl_blocking_page.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -24,6 +23,7 @@ #include "chrome/common/notification_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc index 0b235fc..3fc3de6 100644 --- a/chrome/browser/sync/sync_setup_wizard.cc +++ b/chrome/browser/sync/sync_setup_wizard.cc @@ -4,7 +4,6 @@ #include "chrome/browser/sync/sync_setup_wizard.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/singleton.h" #include "chrome/browser/browser_thread.h" @@ -22,6 +21,7 @@ #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 3e73fbc..b4eb6f1 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -5,7 +5,6 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" @@ -17,6 +16,7 @@ #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" typedef GoogleServiceAuthError AuthError; diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc index eb7611d..25af057 100644 --- a/chrome/browser/tab_contents/navigation_entry.cc +++ b/chrome/browser/tab_contents/navigation_entry.cc @@ -4,7 +4,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" @@ -14,6 +13,7 @@ #include "chrome/common/url_constants.h" #include "grit/app_resources.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" // Use this to get a new unique ID for a NavigationEntry during construction. diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index bfd1a40..2f975a7d 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -7,7 +7,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/auto_reset.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" @@ -103,6 +102,7 @@ #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/password_form.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 020886c..be8e567 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -5,7 +5,6 @@ #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_errors.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 2779f8f6..cc440b9 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -5,7 +5,6 @@ #include "chrome/browser/task_manager/task_manager.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" @@ -33,6 +32,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/coll.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index ed8f848..e436347 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -7,7 +7,6 @@ #include "build/build_config.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/file_version_info.h" #include "base/i18n/rtl.h" @@ -41,6 +40,7 @@ #include "chrome/common/sqlite_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 3ddc0cb..517efd0 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -4,8 +4,6 @@ #include "chrome/browser/themes/browser_theme_pack.h" -#include "app/data_pack.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" @@ -20,6 +18,8 @@ #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "ui/base/resource/data_pack.h" +#include "ui/base/resource/resource_bundle.h" namespace { @@ -370,7 +370,7 @@ scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack( FilePath path, const std::string& expected_id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); scoped_refptr<BrowserThemePack> pack(new BrowserThemePack); - pack->data_pack_.reset(new app::DataPack); + pack->data_pack_.reset(new ui::DataPack); if (!pack->data_pack_->Load(path)) { LOG(ERROR) << "Failed to load theme data pack."; @@ -448,7 +448,7 @@ bool BrowserThemePack::WriteToDisk(FilePath path) const { RepackImages(prepared_images_, &reencoded_images); AddRawImagesTo(reencoded_images, &resources); - return app::DataPack::WritePack(path, resources); + return ui::DataPack::WritePack(path, resources); } bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const { @@ -583,7 +583,7 @@ void BrowserThemePack::BuildHeader(const Extension* extension) { header_->version = kThemePackVersion; // TODO(erg): Need to make this endian safe on other computers. Prerequisite - // is that app::DataPack removes this same check. + // is that ui::DataPack removes this same check. #if defined(__BYTE_ORDER) // Linux check COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN, diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index b90f30a..1e21f39 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -16,12 +16,12 @@ #include "chrome/browser/browser_thread.h" #include "chrome/common/extensions/extension.h" -namespace app { -class DataPack; -} class DictionaryValue; class FilePath; class RefCountedMemory; +namespace ui { +class DataPack; +} // An optimized representation of a theme, backed by a mmapped DataPack. // @@ -170,7 +170,7 @@ class BrowserThemePack : public base::RefCountedThreadSafe< color_utils::HSL GetTintInternal(int id) const; // Data pack, if we have one. - scoped_ptr<app::DataPack> data_pack_; + scoped_ptr<ui::DataPack> data_pack_; // All structs written to disk need to be packed; no alignment tricks here, // please. diff --git a/chrome/browser/themes/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index 8841d72..3ebbd37 100644 --- a/chrome/browser/themes/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -4,7 +4,6 @@ #include "chrome/browser/themes/browser_theme_provider.h" -#include "app/resource_bundle.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -18,6 +17,7 @@ #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "ui/base/win/hwnd_util.h" diff --git a/chrome/browser/themes/browser_theme_provider.h b/chrome/browser/themes/browser_theme_provider.h index d3865db..fe65a7d 100644 --- a/chrome/browser/themes/browser_theme_provider.h +++ b/chrome/browser/themes/browser_theme_provider.h @@ -14,16 +14,20 @@ #include "base/threading/non_thread_safe.h" #include "ui/base/theme_provider.h" -namespace color_utils { -struct HSL; -} - class BrowserThemePack; class BrowserThemeProviderTest; class Extension; class FilePath; class Profile; + +namespace color_utils { +struct HSL; +} + +namespace ui { class ResourceBundle; +} +using ui::ResourceBundle; #ifdef __OBJC__ @class NSString; diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc index 356975d..c28a5c5 100644 --- a/chrome/browser/translate/translate_infobar_delegate.cc +++ b/chrome/browser/translate/translate_infobar_delegate.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "chrome/common/chrome_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" // static TranslateInfoBarDelegate* TranslateInfoBarDelegate::CreateDelegate( diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 446a87f..20bf7f2 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/translate/translate_manager.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/metrics/histogram.h" @@ -39,6 +38,7 @@ #include "grit/browser_resources.h" #include "net/base/escape.h" #include "net/url_request/url_request_status.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 6d5b499..65af6db 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -7,7 +7,6 @@ #include <algorithm> // For max(). #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/environment.h" #include "base/event_recorder.h" #include "base/file_path.h" @@ -66,6 +65,7 @@ #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "net/url_request/url_request.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm index 7122ca3..2a2de02 100644 --- a/chrome/browser/ui/cocoa/about_window_controller.mm +++ b/chrome/browser/ui/cocoa/about_window_controller.mm @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/string_number_conversions.h" @@ -25,6 +24,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 04ada27..84e1ac8 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" @@ -44,6 +43,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/resource/resource_bundle.h" // Bookmark bar state changing and animations // diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm index ff26512..f3663b4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -13,6 +12,7 @@ #include "grit/app_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "ui/base/resource/resource_bundle.h" // Simple class to remember how many mouseEntered: and mouseExited: // calls it gets. Only used by BookmarkMouseForwarding but placed diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 1232dbb..5543da9 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -5,7 +5,6 @@ #import <AppKit/AppKit.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "app/mac/nsimage_cache.h" #include "base/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" @@ -18,6 +17,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/resource/resource_bundle.h" BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile) : menuIsValid_(false), diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 40c4dff..4697bf5 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +21,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { // Colors for the infobar. diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm index 02baaff..1448bd7 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm @@ -5,11 +5,11 @@ #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { static const int kExtraMarginBelowWhenExpirationEditable = 5; diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 80f96d8..15551d9 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/download/download_item_controller.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/metrics/histogram.h" #include "base/string16.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index bede2d6..027dcb16 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "ui/base/resource/resource_bundle.h" // Download shelf autoclose behavior: // diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm index d95b732..beff0a6c 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -11,7 +11,6 @@ #import <QuartzCore/QuartzCore.h> -#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" #include "chrome/common/notification_registrar.h" @@ -21,6 +20,7 @@ #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "ui/base/resource/resource_bundle.h" class DownloadAnimationTabObserver; diff --git a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm index c3a477f..24d4f16 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm @@ -6,7 +6,6 @@ #include <cmath> -#include "app/resource_bundle.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -20,6 +19,7 @@ #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/resource/resource_bundle.h" namespace { const CGFloat kAnimationDuration = 0.12; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm index 3306806..02a7fe3 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_install_ui.h" @@ -16,6 +15,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/resource/resource_bundle.h" class Profile; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 8e34024..94d146c 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -5,7 +5,6 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" @@ -26,6 +25,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm index d2db766..6d68d0f 100644 --- a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm +++ b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm @@ -4,13 +4,13 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #include "base/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/hover_image_button.h" +#include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 2c9d337..b5bea2a 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/process_util.h" @@ -25,6 +24,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { // We only support showing one of these at a time per app. The diff --git a/chrome/browser/ui/cocoa/keystone_infobar.mm b/chrome/browser/ui/cocoa/keystone_infobar.mm index 09c0d8c..6f86576 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar.mm @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/task.h" @@ -27,6 +26,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" class SkBitmap; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm index 845835a..0b8d2cc 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" @@ -21,6 +20,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #import "third_party/ocmock/OCMock/OCMock.h" +#include "ui/base/resource/resource_bundle.h" using ::testing::Return; using ::testing::StrictMock; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm index c85c738..a86e8ce 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #import "base/mac/cocoa_protocols.h" #include "base/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" @@ -18,6 +17,7 @@ #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "ui/base/resource/resource_bundle.h" using ::testing::A; using ::testing::InSequence; diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index ac6b564..536b701 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm index 767092b..97d19c8 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm @@ -7,7 +7,6 @@ #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -15,6 +14,7 @@ #include "grit/theme_resources.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 2d0f298..692ae96 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -53,6 +52,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index f3d40bb..04dc3b5 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" @@ -13,6 +12,7 @@ #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" class MenuControllerTest : public CocoaTest { }; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index 6fca0a1..a927081 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" -#include "app/resource_bundle.h" #import "base/mac/cocoa_protocols.h" #include "base/mac/mac_util.h" #import "base/scoped_nsobject.h" @@ -23,6 +22,7 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm index 64f2b0c..ae5dc9e 100644 --- a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm +++ b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browsing_data_remover.h" @@ -20,6 +19,7 @@ #include "skia/ext/skia_utils_mac.h" #include "third_party/apple/ImageAndTextCell.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" // Key path used for notifying KVO. static NSString* const kCocoaTreeModel = @"cocoaTreeModel"; diff --git a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm index 2a93f13..1428697 100644 --- a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/logging.h" #import "base/mac/mac_util.h" #include "base/string16.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm index 44718a5..e8e73eb 100644 --- a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm +++ b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm @@ -8,7 +8,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_aedesc.h" @@ -65,6 +64,7 @@ #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/sad_tab_view.mm b/chrome/browser/ui/cocoa/sad_tab_view.mm index 2c9f9e2..64ec7f6 100644 --- a/chrome/browser/ui/cocoa/sad_tab_view.mm +++ b/chrome/browser/ui/cocoa/sad_tab_view.mm @@ -4,11 +4,11 @@ #include "chrome/browser/ui/cocoa/sad_tab_view.h" -#include "app/resource_bundle.h" #include "base/logging.h" #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" // Offset above vertical middle of page where contents of page start. static const CGFloat kSadTabOffset = -64; diff --git a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm index 699f342..595ea31 100644 --- a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" @@ -18,6 +17,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" // Horizontal spacing between search engine choices. const int kSearchEngineSpacing = 20; diff --git a/chrome/browser/ui/cocoa/speech_input_window_controller.mm b/chrome/browser/ui/cocoa/speech_input_window_controller.mm index abb9128..8024c5c6 100644 --- a/chrome/browser/ui/cocoa/speech_input_window_controller.mm +++ b/chrome/browser/ui/cocoa/speech_input_window_controller.mm @@ -5,7 +5,6 @@ #import "speech_input_window_controller.h" #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/info_bubble_view.h" @@ -13,6 +12,7 @@ #include "grit/theme_resources.h" #import "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/resource/resource_bundle.h" const int kBubbleControlVerticalSpacing = 10; // Space between controls. const int kBubbleHorizontalMargin = 5; // Space on either sides of controls. diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm index 45d1950..2f6ae84 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" @@ -11,6 +10,7 @@ #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/resource/resource_bundle.h" class SkBitmap; diff --git a/chrome/browser/ui/cocoa/styled_text_field_cell.mm b/chrome/browser/ui/cocoa/styled_text_field_cell.mm index 56b0cf3..ae81ef1 100644 --- a/chrome/browser/ui/cocoa/styled_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/styled_text_field_cell.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/styled_text_field_cell.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "gfx/font.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 4028d84..d4a3716 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -8,7 +8,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/scoped_callback_factory.h" @@ -34,6 +33,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "ui/base/resource/resource_bundle.h" const int kTopGradientHeight = 15; diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index e16ba08..432d3d5 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -11,7 +11,6 @@ #include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -48,6 +47,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "ui/base/resource/resource_bundle.h" NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm index 18da43d..e09ef42 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm @@ -4,13 +4,13 @@ #import <Cocoa/Cocoa.h> -#include "app/resource_bundle.h" #include "base/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#include "grit/app_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "grit/app_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index da8f59a..7ff1824 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -9,7 +9,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "app/mac/nsimage_cache.h" -#include "app/resource_bundle.h" #include "base/mac/mac_util.h" #include "base/singleton.h" #include "base/sys_string_conversions.h" @@ -57,6 +56,7 @@ #include "grit/theme_resources.h" #include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/menu_model.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc index e610a95..65c44d3 100644 --- a/chrome/browser/ui/gtk/about_chrome_dialog.cc +++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/google/google_util.h" @@ -27,6 +26,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webkit_glue.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc index e70ea19..a54172c 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -46,6 +45,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc index 1c2bc1c..813482e 100644 --- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/pickle.h" #include "base/string16.h" #include "base/string_util.h" @@ -21,6 +20,7 @@ #include "gfx/font.h" #include "gfx/gtk_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 22b8c44..920cefa 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -11,7 +11,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -42,6 +41,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc index a59cc1c..a838c21 100644 --- a/chrome/browser/ui/gtk/custom_button.cc +++ b/chrome/browser/ui/gtk/custom_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/custom_button.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "chrome/browser/ui/gtk/cairo_cached_surface.h" #include "chrome/browser/ui/gtk/gtk_chrome_button.h" @@ -15,6 +14,7 @@ #include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, int normal_id, diff --git a/chrome/browser/ui/gtk/download_item_gtk.cc b/chrome/browser/ui/gtk/download_item_gtk.cc index 52ac648..b532d17 100644 --- a/chrome/browser/ui/gtk/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download_item_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/gtk/download_item_gtk.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/metrics/histogram.h" @@ -34,6 +33,7 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download_shelf_gtk.cc index 0a87534..ff49223 100644 --- a/chrome/browser/ui/gtk/download_shelf_gtk.cc +++ b/chrome/browser/ui/gtk/download_shelf_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" @@ -23,6 +22,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download_started_animation_gtk.cc index 1f7765e..abcdcc5 100644 --- a/chrome/browser/ui/gtk/download_started_animation_gtk.cc +++ b/chrome/browser/ui/gtk/download_started_animation_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_registrar.h" @@ -14,6 +13,7 @@ #include "gfx/rect.h" #include "grit/theme_resources.h" #include "ui/base/animation/linear_animation.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index e8819dd..188d3ce 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/extension_infobar_gtk.cc index 59527cd..fbde501 100644 --- a/chrome/browser/ui/gtk/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/extension_infobar_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/extension_infobar_gtk.h" -#include "app/resource_bundle.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" @@ -13,6 +12,7 @@ #include "chrome/common/extensions/extension_resource.h" #include "gfx/gtk_util.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" ExtensionInfoBarGtk::ExtensionInfoBarGtk(ExtensionInfoBarDelegate* delegate) : InfoBar(delegate), diff --git a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc index a8fca31..e900ca8 100644 --- a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -26,6 +25,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index cba73f9..36e4bdd 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -11,7 +11,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -37,6 +36,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 2df1960..677e959 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -29,6 +28,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #if defined(USE_LINUX_BREAKPAD) #include "chrome/app/breakpad_linux.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.cc b/chrome/browser/ui/gtk/gtk_theme_provider.cc index 055202f..1cdc020 100644 --- a/chrome/browser/ui/gtk/gtk_theme_provider.cc +++ b/chrome/browser/ui/gtk/gtk_theme_provider.cc @@ -8,7 +8,6 @@ #include <set> -#include "app/resource_bundle.h" #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/stl_util-inl.h" @@ -38,6 +37,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkShader.h" #include "ui/base/gtk/gtk_signal_registrar.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index ed3e716..9de26c2 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -12,7 +12,6 @@ #include <map> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/environment.h" #include "base/i18n/rtl.h" #include "base/linux_util.h" @@ -36,6 +35,7 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 2136e74..10880df 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index b1d0385..30d5f03 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/i18n/rtl.h" @@ -61,6 +60,7 @@ #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/window_open_disposition.h" namespace { diff --git a/chrome/browser/ui/gtk/nine_box.cc b/chrome/browser/ui/gtk/nine_box.cc index 8eb39fc..3295c85 100644 --- a/chrome/browser/ui/gtk/nine_box.cc +++ b/chrome/browser/ui/gtk/nine_box.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/gtk/nine_box.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "gfx/gtk_util.h" #include "gfx/point.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index 2d45e4c..7c97a8d 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" @@ -43,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/options/content_exception_editor.cc b/chrome/browser/ui/gtk/options/content_exception_editor.cc index 06f1fa6..c899391 100644 --- a/chrome/browser/ui/gtk/options/content_exception_editor.cc +++ b/chrome/browser/ui/gtk/options/content_exception_editor.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/gtk/options/content_exception_editor.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" @@ -14,6 +13,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" ContentExceptionEditor::ContentExceptionEditor( GtkWindow* parent, diff --git a/chrome/browser/ui/gtk/overflow_button.cc b/chrome/browser/ui/gtk/overflow_button.cc index f2f6a58..45dcec4 100644 --- a/chrome/browser/ui/gtk/overflow_button.cc +++ b/chrome/browser/ui/gtk/overflow_button.cc @@ -6,12 +6,12 @@ #include <gtk/gtk.h> -#include "app/resource_bundle.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" OverflowButton::OverflowButton(Profile* profile) : profile_(profile) { widget_.Own(GtkThemeProvider::GetFrom(profile)->BuildChromeButton()); diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc index 8985417..25dba4b 100644 --- a/chrome/browser/ui/gtk/sad_tab_gtk.cc +++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" @@ -16,6 +15,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc index 024a616..ab65f6e 100644 --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" @@ -12,6 +11,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 87d6bab..fc21e6e 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -8,7 +8,6 @@ #include <utility> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/profiles/profile.h" @@ -28,6 +27,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 42c9f92..c79e8c1 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -34,6 +33,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index ff0fd76..83b7a57 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -12,7 +12,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/logging.h" @@ -32,6 +31,7 @@ #include "grit/chromium_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" #if defined(TOOLKIT_VIEWS) #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 3ceee8d..06e0841 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -7,7 +7,6 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" const int BackForwardMenuModel::kMaxHistoryItems = 12; diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 25ddc19..1783c50 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -8,7 +8,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" #include "base/string_number_conversions.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/models/button_menu_item_model.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_LINUX) #include <gtk/gtk.h> diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index c01eb07..c002142 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -13,7 +13,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/textfield/textfield.h" #include "views/controls/throbber.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index 51d589a..f7f15f1 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/i18n/bidi_line_iterator.h" #include "base/i18n/rtl.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/base/theme_provider.h" #include "unicode/ubidi.h" diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index f013d83..8708694 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -8,7 +8,6 @@ #include <vssym32.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -34,6 +33,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/border.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index ede1b44..19ecaa6 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -42,6 +41,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc index 0f55895..4d582b3 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmark_bubble_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/bookmark_bubble_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/event.h" #include "views/standard_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_menu_controller_views.cc index 6f761d0..a114a8b 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/bookmark_menu_controller_views.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" using views::MenuItemView; diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 817dc7c..e90d5bd 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/browser_actions_container.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -38,6 +37,7 @@ #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/views/bubble_border.cc b/chrome/browser/ui/views/bubble_border.cc index c0c1642..56bc303 100644 --- a/chrome/browser/ui/views/bubble_border.cc +++ b/chrome/browser/ui/views/bubble_border.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/bubble_border.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "gfx/canvas_skia.h" #include "gfx/path.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" // static SkBitmap* BubbleBorder::left_ = NULL; diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc index b506415..d686d8b 100644 --- a/chrome/browser/ui/views/clear_server_data.cc +++ b/chrome/browser/ui/views/clear_server_data.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/clear_server_data.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index b939cf5..0dfe571 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/collected_cookies_win.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/box_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index 920be4b..e669319 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "app/win/win_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/controls/button/image_button.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index dcbe13f..19deb29 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/create_application_shortcut_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" @@ -25,6 +24,7 @@ #include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index edea15e..eb4af7b 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -19,6 +18,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/message_box_flags.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index 09be69b..8faf5e1 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.cc +++ b/chrome/browser/ui/views/detachable_toolbar_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/detachable_toolbar_view.h" -#include "app/resource_bundle.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/window/non_client_view.h" // How round the 'new tab' style bookmarks bar is. diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc index 155cc09..6a97104 100644 --- a/chrome/browser/ui/views/download_item_view.cc +++ b/chrome/browser/ui/views/download_item_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/file_path.h" #include "base/i18n/rtl.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/button/native_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index 9701df5..de3a845 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_item.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/download_started_animation_win.cc b/chrome/browser/ui/views/download_started_animation_win.cc index cbcbc97..8b6146f 100644 --- a/chrome/browser/ui/views/download_started_animation_win.cc +++ b/chrome/browser/ui/views/download_started_animation_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_started_animation.h" -#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" @@ -12,6 +11,7 @@ #include "gfx/rect.h" #include "grit/theme_resources.h" #include "ui/base/animation/linear_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 7372379..45d1249 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/edit_search_engine_dialog.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -15,6 +14,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/image_view.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 7cc35db..2ebf514 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -24,6 +23,7 @@ #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index e992f2a..b189cbd 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 299a9a6..b1b2d84 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/first_run_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -18,6 +17,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_font_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/event.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 275b891..63b7e2a 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/rand_util.h" #include "base/time.h" @@ -27,6 +26,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 8838a8d..9c0707a 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -18,6 +17,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/window/window.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index c0d454e..de9afc7 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -9,7 +9,6 @@ #endif #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" @@ -74,6 +73,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "grit/webkit_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/single_split_view.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 8e74eae..172e4b5 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" -#include "app/resource_bundle.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/themes/browser_theme_provider.h" @@ -16,6 +15,7 @@ #include "gfx/icon_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/window/client_view.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 9070699..60e960ab 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -21,6 +20,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc index 2e59e6b..485669c 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc @@ -5,13 +5,13 @@ #include "chrome/browser/ui/views/fullscreen_exit_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/screen.h" #include "views/widget/root_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index f6f60f5..fa6a139 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/hung_renderer_dialog.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -19,6 +18,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index 56a610c..a48ee2d 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/extension_infobar.h" -#include "app/resource_bundle.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/extension_host.h" @@ -16,6 +15,7 @@ #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_2.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc index ef69d71..da0c2fa 100644 --- a/chrome/browser/ui/views/infobars/infobar_button_border.cc +++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/infobars/infobar_button_border.h" -#include "app/resource_bundle.h" #include "gfx/canvas.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" // Preferred padding between text and edge diff --git a/chrome/browser/ui/views/infobars/infobar_text_button.cc b/chrome/browser/ui/views/infobars/infobar_text_button.cc index ec1803d..9c956c4 100644 --- a/chrome/browser/ui/views/infobars/infobar_text_button.cc +++ b/chrome/browser/ui/views/infobars/infobar_text_button.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/infobars/infobar_button_border.h" +#include "ui/base/resource/resource_bundle.h" // static InfoBarTextButton* InfoBarTextButton::Create(views::ButtonListener* listener, diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc index af97d7e..7ac5cec 100644 --- a/chrome/browser/ui/views/infobars/infobars.cc +++ b/chrome/browser/ui/views/infobars/infobars.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/infobars/infobars.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/event_utils.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc index cb8b974..ecba1fe 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/translate_infobar_base.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/views/infobars/after_translate_infobar.h" @@ -14,6 +13,7 @@ #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index 40bfff8..a946a3a1 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_setting_bubble_model.h" @@ -19,6 +18,7 @@ #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/border.h" namespace { diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 696f733..cd98835 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" -#include "app/resource_bundle.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "gfx/canvas.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 4b1d1496..8f6c290 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -14,8 +13,9 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "views/controls/label.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" +#include "views/controls/label.h" // Amount of space to offset the tab image from the top of the view by. static const int kTabImageYOffset = 4; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 1e8943c..fae9b01 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -9,7 +9,6 @@ #endif #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -43,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/label.h" #include "views/drag_utils.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 2d281e6..ba9c882 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/star_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" @@ -13,6 +12,7 @@ #include "chrome/browser/ui/views/browser_dialogs.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" StarView::StarView(CommandUpdater* command_updater) : command_updater_(command_updater) { diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 92bfd9e..dfefc7f 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" @@ -29,6 +28,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 87591b1..c0b2cb2 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -15,7 +15,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" @@ -59,6 +58,7 @@ #include "net/base/ssl_config_service_win.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc index 2f756bf..9b32d54 100644 --- a/chrome/browser/ui/views/options/exception_editor_view.cc +++ b/chrome/browser/ui/views/options/exception_editor_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/options/exception_editor_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" #include "googleurl/src/url_canon.h" @@ -13,6 +12,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc index df6867c..f1e1463 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.cc +++ b/chrome/browser/ui/views/options/fonts_page_view.cc @@ -12,7 +12,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc index e9594ac..bcfa114 100644 --- a/chrome/browser/ui/views/options/languages_page_view.cc +++ b/chrome/browser/ui/views/options/languages_page_view.cc @@ -10,7 +10,6 @@ #include "chrome/browser/ui/views/options/languages_page_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/string_util.h" @@ -32,6 +31,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/uloc.h" #include "views/controls/button/radio_button.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc index bda176d..2cc086c 100644 --- a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc +++ b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" -#include "app/resource_bundle.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/box_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc index ef3583f..dcdfd29 100644 --- a/chrome/browser/ui/views/options/options_group_view.cc +++ b/chrome/browser/ui/views/options/options_group_view.cc @@ -8,7 +8,6 @@ #include "chrome/browser/ui/views/options/options_group_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" @@ -16,6 +15,7 @@ #include "gfx/native_theme_win.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/separator.h" diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index f0f4639..02affe9 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/sad_tab_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -19,6 +18,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" static const int kSadTabOffset = -64; static const int kIconTitleSpacing = 20; diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 027c0a3..7ae317e 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -23,6 +22,7 @@ #include "third_party/skia/include/core/SkRect.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/linear_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/label.h" #include "views/controls/scrollbar/native_scroll_bar.h" diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index 4c44a8f..21a1da1 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/status_icons/status_icon_win.h" @@ -12,6 +11,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" class SkBitmap; diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 7fb1560..7a39737 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -9,7 +9,6 @@ #include <shellapi.h> #endif -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" #include "chrome/app/chrome_command_ids.h" @@ -17,6 +16,7 @@ #include "gfx/favicon_size.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index ae745c5..f36273f 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -7,7 +7,6 @@ #include <limits> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -21,6 +20,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 35ea20d..706b85d 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -7,7 +7,6 @@ #include <math.h> #include <set> -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "chrome/browser/browser_window.h" @@ -33,6 +32,7 @@ #include "ui/base/animation/animation.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index 78b0c5a..dbed8df 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/tabs/side_tab.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" @@ -12,6 +11,7 @@ #include "gfx/skia_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" namespace { diff --git a/chrome/browser/ui/views/tabs/side_tab_strip.cc b/chrome/browser/ui/views/tabs/side_tab_strip.cc index 0df8ce2..dfc3cf0 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/side_tab_strip.cc @@ -5,13 +5,13 @@ #include "chrome/browser/ui/views/tabs/side_tab_strip.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tabs/side_tab.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index b751330..b65df36 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/themes/browser_theme_provider.h" @@ -22,6 +21,7 @@ #include "ui/base/animation/multi_animation.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 9c7ca46..906d360 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/animation_container.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/widget/default_theme_provider.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index 857731f..879156e 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/theme_background.h" -#include "app/resource_bundle.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -12,6 +11,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/view.h" ThemeBackground::ThemeBackground(BrowserView* browser_view) diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index 8b7b30a..c86877f 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/views/theme_install_bubble_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 8e82fc4..9ff2d8f 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/number_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -31,6 +30,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button_dropdown.h" #include "views/focus/view_storage.h" #include "views/widget/tooltip_manager.h" diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index fe6354d..dbbd816 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/url_picker.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "net/base/net_util.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/table_model.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 896ec8a..6898fcd 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -7,7 +7,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc index 4d208fd..378f945 100644 --- a/chrome/browser/utility_process_host.cc +++ b/chrome/browser/utility_process_host.cc @@ -15,6 +15,7 @@ #include "chrome/common/utility_messages.h" #include "ipc/ipc_switches.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/ui_base_switches.h" UtilityProcessHost::UtilityProcessHost(ResourceDispatcherHost* rdh, Client* client, diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index d57a26e..6ad3dbe 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -4,12 +4,12 @@ #include "chrome/common/badge_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkTypeface.h" +#include "ui/base/resource/resource_bundle.h" namespace badge_util { diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index 5fe6094..653742a 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -13,6 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/plugin/npobject_util.h" #include "googleurl/src/url_util.h" +#include "ui/base/ui_base_switches.h" #include "webkit/glue/webkit_glue.h" namespace webkit_glue { diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index 7139fb2..ce6f821 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/common/badge_util.h" #include "gfx/canvas_skia.h" @@ -15,6 +14,7 @@ #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/common/gfx_resource_provider.cc b/chrome/common/gfx_resource_provider.cc index f508c28..8cee034 100644 --- a/chrome/common/gfx_resource_provider.cc +++ b/chrome/common/gfx_resource_provider.cc @@ -4,8 +4,8 @@ #include "chrome/common/gfx_resource_provider.h" -#include "app/resource_bundle.h" #include "base/string_piece.h" +#include "ui/base/resource/resource_bundle.h" namespace chrome { diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc index 628edd7..35e4b3a 100644 --- a/chrome/common/jstemplate_builder.cc +++ b/chrome/common/jstemplate_builder.cc @@ -7,12 +7,11 @@ #include "chrome/common/jstemplate_builder.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/common/json_value_serializer.h" - #include "grit/common_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace jstemplate_builder { diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc index c64c81d..068952f 100644 --- a/chrome/common/net/net_resource_provider.cc +++ b/chrome/common/net/net_resource_provider.cc @@ -7,13 +7,13 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_piece.h" #include "base/values.h" #include "chrome/common/jstemplate_builder.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/net_resources.h" +#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index 42badfa..2761396 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -8,7 +8,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/json/json_reader.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -27,6 +26,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/dom_operations.h" using WebKit::WebDocument; diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm index f964023..0244e62 100644 --- a/chrome/default_plugin/plugin_impl_mac.mm +++ b/chrome/default_plugin/plugin_impl_mac.mm @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> #include "app/l10n_util_mac.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -15,6 +14,7 @@ #include "googleurl/src/gurl.h" #include "grit/default_plugin_resources.h" #include "grit/webkit_strings.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/default_plugin_shared.h" diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index f85e2ed..4653bf3 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -5,7 +5,6 @@ #include "chrome/renderer/blocked_plugin.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/values.h" @@ -23,6 +22,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/webview_plugin.h" diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index 38a8dc2c..307ed07 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -14,6 +14,7 @@ #include "chrome/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "ui/base/ui_base_switches.h" using WebKit::WebDevToolsFrontend; using WebKit::WebString; diff --git a/chrome/renderer/extensions/bindings_utils.h b/chrome/renderer/extensions/bindings_utils.h index f506ce0..b777a4a 100644 --- a/chrome/renderer/extensions/bindings_utils.h +++ b/chrome/renderer/extensions/bindings_utils.h @@ -6,10 +6,10 @@ #define CHROME_RENDERER_EXTENSIONS_BINDINGS_UTILS_H_ #pragma once -#include "app/resource_bundle.h" #include "base/linked_ptr.h" #include "base/singleton.h" #include "base/string_piece.h" +#include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" #include <list> diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc index ec6eaa2..d34385b 100644 --- a/chrome/renderer/extensions/json_schema_unittest.cc +++ b/chrome/renderer/extensions/json_schema_unittest.cc @@ -2,15 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/v8_unit_test.h" -#include "testing/gtest/include/gtest/gtest.h" - #include "grit/renderer_resources.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/resource/resource_bundle.h" static const char kJsonSchema[] = "json_schema.js"; static const char kJsonSchemaTest[] = "json_schema_test.js"; diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 6c17b6d..6edfb5e 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -159,6 +158,7 @@ #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/message_box_flags.h" +#include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" #include "v8/include/v8-testing.h" #include "webkit/appcache/web_application_cache_host_impl.h" diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 8b66357..ecbf7f5 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -12,7 +12,6 @@ #include <vector> -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/ref_counted.h" #include "base/string_util.h" @@ -32,6 +31,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_bridge.h" diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index f1d4555..c047e05 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -6,7 +6,6 @@ #include <map> -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" #include "base/perftimer.h" @@ -20,11 +19,11 @@ #include "chrome/renderer/extensions/extension_renderer_info.h" #include "chrome/renderer/render_thread.h" #include "googleurl/src/gurl.h" +#include "grit/renderer_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" - -#include "grit/renderer_resources.h" +#include "ui/base/resource/resource_bundle.h" using WebKit::WebFrame; using WebKit::WebString; diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index edc959d..dcfe8c1 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -10,7 +10,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_util.h" @@ -47,6 +46,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/resource_bundle.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc index 07ba931..6d79619 100644 --- a/chrome/service/service_utility_process_host.cc +++ b/chrome/service/service_utility_process_host.cc @@ -16,6 +16,7 @@ #include "ipc/ipc_switches.h" #include "printing/native_metafile.h" #include "printing/page_range.h" +#include "ui/base/ui_base_switches.h" #if defined(OS_WIN) #include "base/win/scoped_handle.h" diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index e6db497..bd9cef0 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -42,6 +42,7 @@ #include "testing/gmock_mutant.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/message_box_flags.h" +#include "ui/base/ui_base_switches.h" #include "views/event.h" using ui_test_utils::TimedMessageLoopRunner; diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc index 042ab98..5dfac21 100644 --- a/chrome/test/unit/chrome_test_suite.cc +++ b/chrome/test/unit/chrome_test_suite.cc @@ -5,7 +5,6 @@ #include "chrome/test/unit/chrome_test_suite.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/metrics/stats_table.h" @@ -17,6 +16,8 @@ #include "chrome/common/url_constants.h" #include "chrome/test/testing_browser_process.h" #include "net/base/net_errors.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -94,6 +95,7 @@ void ChromeTestSuite::Initialize() { chrome::RegisterPathProvider(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); g_browser_process = new TestingBrowserProcess; if (!browser_dir_.empty()) { diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm index 727932f..8e9a0a6 100644 --- a/chrome/tools/mac_helpers/infoplist_strings_util.mm +++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm @@ -11,13 +11,13 @@ #include <stdio.h> #include <unistd.h> -#include "app/data_pack.h" #include "base/file_path.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/scoped_ptr.h" #include "base/string_piece.h" #include "base/string_util.h" #include "grit/chromium_strings.h" +#include "ui/base/resource/data_pack.h" namespace { @@ -51,16 +51,16 @@ NSString* ApplicationVersionString(const char* version_file_path) { return nil; } -app::DataPack* LoadResourceDataPack(const char* dir_path, - const char* branding_strings_name, - const char* locale_name) { - app::DataPack* resource_pack = NULL; +ui::DataPack* LoadResourceDataPack(const char* dir_path, + const char* branding_strings_name, + const char* locale_name) { + ui::DataPack* resource_pack = NULL; NSString* resource_path = [NSString stringWithFormat:@"%s/%s_%s.pak", dir_path, branding_strings_name, locale_name]; if (resource_path) { FilePath resources_pak_path([resource_path fileSystemRepresentation]); - resource_pack = new app::DataPack; + resource_pack = new ui::DataPack; bool success = resource_pack->Load(resources_pak_path); if (!success) { delete resource_pack; @@ -71,7 +71,7 @@ app::DataPack* LoadResourceDataPack(const char* dir_path, return resource_pack; } -NSString* LoadStringFromDataPack(app::DataPack* data_pack, +NSString* LoadStringFromDataPack(ui::DataPack* data_pack, const char* data_pack_lang, uint32_t resource_id, const char* resource_id_str) { @@ -204,7 +204,7 @@ int main(int argc, char* const argv[]) { const char* cur_lang = lang_list[loop]; // Open the branded string pak file - scoped_ptr<app::DataPack> branded_data_pack( + scoped_ptr<ui::DataPack> branded_data_pack( LoadResourceDataPack(grit_output_dir, branding_strings_name, cur_lang)); diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 445d8bb..4f6169e 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -8,7 +8,6 @@ #include "chrome/tools/profiles/thumbnail-inl.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/file_path.h" @@ -29,6 +28,8 @@ #include "chrome/common/notification_service.h" #include "gfx/codec/jpeg_codec.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" using base::Time; @@ -233,6 +234,7 @@ int main(int argc, const char* argv[]) { chrome::RegisterPathProvider(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); ResourceBundle::InitSharedInstance("en-US"); NotificationService notification_service; MessageLoopForUI message_loop; diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc index d0159dd..440f1ef 100644 --- a/chrome/utility/utility_main.cc +++ b/chrome/utility/utility_main.cc @@ -18,6 +18,7 @@ #include "chrome/common/main_function_params.h" #include "chrome/utility/utility_thread.h" #include "ui/base/system_monitor/system_monitor.h" +#include "ui/base/ui_base_switches.h" #if defined(OS_WIN) #include "chrome/common/chrome_switches.h" diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 2341575..26b9436 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -30,6 +30,7 @@ #include "chrome_frame/navigation_constraints.h" #include "chrome_frame/simple_resource_loader.h" #include "chrome_frame/utils.h" +#include "ui/base/ui_base_switches.h" #ifdef NDEBUG int64 kAutomationServerReasonableLaunchDelay = 1000; // in milliseconds diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index c48af62..7091021 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -9,7 +9,6 @@ #include <exdisp.h> #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "app/win/scoped_com_initializer.h" #include "base/command_line.h" #include "base/debug/debugger.h" @@ -42,6 +41,8 @@ #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/utils.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" namespace { @@ -193,6 +194,7 @@ void FakeExternalTab::Initialize() { chrome::RegisterPathProvider(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); // Load Chrome.dll as our resource dll. FilePath dll; @@ -1,6 +1,7 @@ include_rules = [ "+gfx", "+net", + "+skia", "+third_party/mozilla", # Temporary until all of src/app is consumed into src/ui diff --git a/ui/README.chromium b/ui/README.chromium new file mode 100644 index 0000000..3279ad9 --- /dev/null +++ b/ui/README.chromium @@ -0,0 +1,16 @@ +This directory contains elements of Chromium's user interface toolkit:
+
+base/
+ Common UI framework components for resource loading, localization,
+ string formatting, cross platform model interfaces etc.
+views/
+ UI "View" framework used for building interfaces on Windows and Linux
+ (ChromeOS).
+
+This directory is NOT for things that are unrelated to a user interface library,
+even if:
+* they are shared by multiple top level directories in src/,
+* brettw won't let you put them in base!
+* it's just two little files... come on!
+
+- ben@chromium.org
diff --git a/app/data_pack.cc b/ui/base/resource/data_pack.cc index 93f7e82..f1cedcc 100644 --- a/app/data_pack.cc +++ b/ui/base/resource/data_pack.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/data_pack.h" +#include "ui/base/resource/data_pack.h" #include <errno.h> @@ -57,9 +57,9 @@ enum LoadErrors { LOAD_ERRORS_COUNT, }; -} // anonymous namespace +} // namespace -namespace app { +namespace ui { // In .cc for MemoryMappedFile dtor. DataPack::DataPack() : resource_count_(0) { @@ -216,4 +216,4 @@ bool DataPack::WritePack(const FilePath& path, return true; } -} // namespace app +} // namespace ui diff --git a/app/data_pack.h b/ui/base/resource/data_pack.h index aeeee98..2f890c6 100644 --- a/app/data_pack.h +++ b/ui/base/resource/data_pack.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,8 +6,8 @@ // (key, value) pairs of data. It's used to store static resources like // translation strings and images. -#ifndef APP_DATA_PACK_H_ -#define APP_DATA_PACK_H_ +#ifndef UI_BASE_RESOURCE_DATA_PACK_H_ +#define UI_BASE_RESOURCE_DATA_PACK_H_ #pragma once #include <map> @@ -15,6 +15,9 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" +class FilePath; +class RefCountedStaticMemory; + namespace base { class StringPiece; } @@ -23,11 +26,7 @@ namespace file_util { class MemoryMappedFile; } -class FilePath; -class RefCountedStaticMemory; - - -namespace app { +namespace ui { class DataPack { public: @@ -61,6 +60,6 @@ class DataPack { DISALLOW_COPY_AND_ASSIGN(DataPack); }; -} // namespace app +} // namespace ui -#endif // APP_DATA_PACK_H_ +#endif // UI_BASE_RESOURCE_DATA_PACK_H_ diff --git a/app/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index 83521ff..fb15a07 100644 --- a/app/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -1,17 +1,16 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/data_pack.h" - #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/resource/data_pack.h" -namespace app { +namespace ui { TEST(DataPackTest, Load) { FilePath data_path; @@ -74,4 +73,4 @@ TEST(DataPackTest, Write) { EXPECT_EQ(fifteen, data); } -} // namespace app +} // namespace ui diff --git a/app/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index 79d6cd8..94885b0 100644 --- a/app/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" -#include "app/data_pack.h" #include "base/lock.h" #include "base/logging.h" #include "base/stl_util-inl.h" @@ -13,6 +12,9 @@ #include "gfx/codec/png_codec.h" #include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/data_pack.h" + +namespace ui { namespace { @@ -247,7 +249,7 @@ ResourceBundle::LoadedDataPack::~LoadedDataPack() { void ResourceBundle::LoadedDataPack::Load() { DCHECK(!data_pack_.get()); - data_pack_.reset(new app::DataPack); + data_pack_.reset(new ui::DataPack); bool success = data_pack_->Load(path_); LOG_IF(ERROR, !success) << "Failed to load " << path_.value() << "\nYou will not be able to use the Bookmarks Manager or " @@ -263,3 +265,5 @@ RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory( int resource_id) const { return data_pack_->GetStaticMemory(resource_id); } + +} // namespace ui diff --git a/app/resource_bundle.h b/ui/base/resource/resource_bundle.h index 352bc96..9a961e2 100644 --- a/app/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef APP_RESOURCE_BUNDLE_H_ -#define APP_RESOURCE_BUNDLE_H_ +#ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ +#define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ #pragma once #include "build/build_config.h" @@ -23,20 +23,17 @@ #include "base/string16.h" #include "gfx/native_widget_types.h" -namespace app { -class DataPack; -} +class SkBitmap; +typedef uint32 SkColor; + namespace base { class Lock; +class StringPiece; } + namespace gfx { class Font; } -class SkBitmap; -typedef uint32 SkColor; -namespace base { -class StringPiece; -} #if defined(OS_MACOSX) #ifdef __OBJC__ @@ -50,6 +47,10 @@ class NSImage; typedef struct _GdkPixbuf GdkPixbuf; #endif +namespace ui { + +class DataPack; + // ResourceBundle is a central facility to load images and other resources, // such as theme graphics. // Every resource is loaded only once. @@ -176,7 +177,7 @@ class ResourceBundle { private: void Load(); - scoped_ptr<app::DataPack> data_pack_; + scoped_ptr<DataPack> data_pack_; FilePath path_; DISALLOW_COPY_AND_ASSIGN(LoadedDataPack); @@ -189,7 +190,7 @@ class ResourceBundle { typedef HINSTANCE DataHandle; #elif defined(USE_BASE_DATA_PACK) // Linux uses base::DataPack. - typedef app::DataPack* DataHandle; + typedef DataPack* DataHandle; #endif // Ctor/dtor are private, since we're a singleton. @@ -274,4 +275,9 @@ class ResourceBundle { DISALLOW_COPY_AND_ASSIGN(ResourceBundle); }; -#endif // APP_RESOURCE_BUNDLE_H_ +} // namespace ui + +// TODO(beng): Someday, maybe, get rid of this. +using ui::ResourceBundle; + +#endif // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_ diff --git a/app/resource_bundle_dummy.cc b/ui/base/resource/resource_bundle_dummy.cc index 510b8fd..fc46ace 100644 --- a/app/resource_bundle_dummy.cc +++ b/ui/base/resource/resource_bundle_dummy.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" #include <windows.h> @@ -11,8 +11,6 @@ #include "gfx/font.h" #include "gfx/platform_font_win.h" -ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; - // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific // files. The font members of ResourceBundle are never initialized in our code // so this destructor is never called. @@ -25,6 +23,9 @@ PlatformFontWin::HFontRef::~HFontRef() { } } +namespace ui { + +ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; /* static */ std::string ResourceBundle::InitSharedInstance( @@ -62,3 +63,5 @@ ResourceBundle::~ResourceBundle() { string16 ResourceBundle::GetLocalizedString(int message_id) { return string16(); } + +} // namespace ui diff --git a/app/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc index 18d994f7..92a39df 100644 --- a/app/resource_bundle_linux.cc +++ b/ui/base/resource/resource_bundle_linux.cc @@ -1,12 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" #include <gtk/gtk.h> -#include "app/app_paths.h" #include "base/base_paths.h" #include "base/file_path.h" #include "base/file_util.h" @@ -19,6 +18,9 @@ #include "gfx/font.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/ui_base_paths.h" + +namespace ui { namespace { @@ -66,14 +68,14 @@ void ResourceBundle::FreeGdkPixBufs() { // static FilePath ResourceBundle::GetResourcesFilePath() { FilePath resources_file_path; - PathService::Get(app::FILE_RESOURCES_PAK, &resources_file_path); + PathService::Get(ui::FILE_RESOURCES_PAK, &resources_file_path); return resources_file_path; } // static FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) { FilePath locale_file_path; - PathService::Get(app::DIR_LOCALES, &locale_file_path); + PathService::Get(ui::DIR_LOCALES, &locale_file_path); if (locale_file_path.empty()) return locale_file_path; if (app_locale.empty()) @@ -142,3 +144,5 @@ GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) { GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) { return GetPixbufImpl(resource_id, true); } + +} // namespace ui diff --git a/app/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 23ebd7a..e859b1c 100644 --- a/app/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" #import <Foundation/Foundation.h> @@ -12,6 +12,8 @@ #include "base/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" +namespace ui { + namespace { FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { @@ -66,3 +68,5 @@ NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); return nsimage; } + +} // namespace ui diff --git a/app/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index f3c868b..119d721 100644 --- a/app/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" -#include "app/data_pack.h" #include "app/l10n_util.h" #include "base/lock.h" #include "base/logging.h" @@ -12,11 +11,14 @@ #include "base/string16.h" #include "base/string_piece.h" #include "gfx/font.h" +#include "ui/base/resource/data_pack.h" + +namespace ui { namespace { -app::DataPack* LoadResourcesDataPak(FilePath resources_pak_path) { - app::DataPack* resources_pak = new app::DataPack; +DataPack* LoadResourcesDataPak(FilePath resources_pak_path) { + DataPack* resources_pak = new DataPack; bool success = resources_pak->Load(resources_pak_path); if (!success) { delete resources_pak; @@ -115,3 +117,5 @@ std::string ResourceBundle::LoadLocaleResources( CHECK(locale_resources_data_) << "failed to load locale.pak"; return app_locale; } + +} // namespace ui diff --git a/app/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc index 616faac..9f590d5 100644 --- a/app/resource_bundle_win.cc +++ b/ui/base/resource/resource_bundle_win.cc @@ -1,13 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" #include <atlbase.h> -#include "app/app_paths.h" -#include "app/data_pack.h" #include "app/l10n_util.h" #include "base/debug/stack_trace.h" #include "base/file_util.h" @@ -18,8 +16,11 @@ #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "base/win/windows_version.h" - #include "gfx/font.h" +#include "ui/base/ui_base_paths.h" +#include "ui/base/resource/data_pack.h" + +namespace ui { namespace { @@ -78,7 +79,7 @@ void ResourceBundle::UnloadLocaleResources() { // static FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) { FilePath locale_path; - PathService::Get(app::DIR_LOCALES, &locale_path); + PathService::Get(ui::DIR_LOCALES, &locale_path); if (app_locale.empty()) return FilePath(); @@ -165,3 +166,5 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { // Copy into a string16 and return. return string16(image->achString, image->nLength); } + +} // namespace ui; diff --git a/ui/base/test/data/data_pack_unittest/sample.pak b/ui/base/test/data/data_pack_unittest/sample.pak Binary files differnew file mode 100644 index 0000000..fdbe2b5 --- /dev/null +++ b/ui/base/test/data/data_pack_unittest/sample.pak diff --git a/ui/base/test/data/resource.h b/ui/base/test/data/resource.h new file mode 100644 index 0000000..bb82442 --- /dev/null +++ b/ui/base/test/data/resource.h @@ -0,0 +1,28 @@ +// Copyright (c) 2009 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. + +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by resource.rc +// +#define IDS_SIMPLE 101 +#define IDS_PLACEHOLDERS 102 +#define IDS_PLACEHOLDERS_2 103 +#define IDS_PLACEHOLDERS_3 104 + +#define IDS_LOCALE_BOOL 105 +#define IDS_LOCALE_INT 106 +#define IDS_LOCALE_STRING 107 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 108 +#pragma once +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc new file mode 100644 index 0000000..14897f0 --- /dev/null +++ b/ui/base/ui_base_paths.cc @@ -0,0 +1,75 @@ +// Copyright (c) 2011 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 "ui/base/ui_base_paths.h" + +#include "base/command_line.h" +#include "base/file_path.h" +#include "base/file_util.h" +#include "base/logging.h" +#include "base/path_service.h" + +namespace ui { + +bool PathProvider(int key, FilePath* result) { + // Assume that we will not need to create the directory if it does not exist. + // This flag can be set to true for the cases where we want to create it. + bool create_dir = false; + + FilePath cur; + switch (key) { + case ui::DIR_LOCALES: + if (!PathService::Get(base::DIR_MODULE, &cur)) + return false; +#if defined(OS_MACOSX) + // On Mac, locale files are in Contents/Resources, a sibling of the + // App dir. + cur = cur.DirName(); + cur = cur.Append(FILE_PATH_LITERAL("Resources")); +#else + cur = cur.Append(FILE_PATH_LITERAL("locales")); +#endif + create_dir = true; + break; + case ui::FILE_RESOURCES_PAK: +#if defined(OS_POSIX) && !defined(OS_MACOSX) + if (!PathService::Get(base::DIR_EXE, &cur)) + return false; + // TODO(tony): We shouldn't be referencing chrome here. + cur = cur.AppendASCII("chrome.pak"); +#else + NOTREACHED(); +#endif + break; + // The following are only valid in the development environment, and + // will fail if executed from an installed executable (because the + // generated path won't exist). + case ui::DIR_TEST_DATA: + if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("app")); + cur = cur.Append(FILE_PATH_LITERAL("test")); + cur = cur.Append(FILE_PATH_LITERAL("data")); + if (!file_util::PathExists(cur)) // we don't want to create this + return false; + break; + default: + return false; + } + + if (create_dir && !file_util::PathExists(cur) && + !file_util::CreateDirectory(cur)) + return false; + + *result = cur; + return true; +} + +// This cannot be done as a static initializer sadly since Visual Studio will +// eliminate this object file if there is no direct entry point into it. +void RegisterPathProvider() { + PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); +} + +} // namespace ui diff --git a/ui/base/ui_base_paths.h b/ui/base/ui_base_paths.h new file mode 100644 index 0000000..3620f29 --- /dev/null +++ b/ui/base/ui_base_paths.h @@ -0,0 +1,33 @@ +// Copyright (c) 2011 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. + +#ifndef UI_BASE_UI_BASE_PATHS_H_ +#define UI_BASE_UI_BASE_PATHS_H_ +#pragma once + +// This file declares path keys for the app module. These can be used with +// the PathService to access various special directories and files. + +namespace ui { + +enum { + PATH_START = 3000, + + DIR_LOCALES, // Directory where locale resources are stored. + + FILE_RESOURCES_PAK, // Path to the data .pak file which holds binary + // resources. + + // Valid only in development environment; TODO(darin): move these + DIR_TEST_DATA, // Directory where unit test data resides. + + PATH_END +}; + +// Call once to register the provider for the path keys defined above. +void RegisterPathProvider(); + +} // namespace ui + +#endif // UI_BASE_UI_BASE_PATHS_H_ diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc new file mode 100644 index 0000000..6a5b3a4 --- /dev/null +++ b/ui/base/ui_base_switches.cc @@ -0,0 +1,13 @@ +// Copyright (c) 2011 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 "ui/base/ui_base_switches.h" + +namespace switches { + +// The language file that we want to try to open. Of the form +// language[-country] where language is the 2 letter code from ISO-639. +const char kLang[] = "lang"; + +} // namespace switches diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h new file mode 100644 index 0000000..22fc9fe --- /dev/null +++ b/ui/base/ui_base_switches.h @@ -0,0 +1,17 @@ +// Copyright (c) 2011 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. + +// Defines all the command-line switches used by ui/base. + +#ifndef UI_BASE_UI_BASE_SWITCHES_H_ +#define UI_BASE_UI_BASE_SWITCHES_H_ +#pragma once + +namespace switches { + +extern const char kLang[]; + +} // namespace switches + +#endif // UI_BASE_UI_BASE_SWITCHES_H_ diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 10220d5..d7510c4 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -5,12 +5,12 @@ #include "views/controls/button/menu_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "grit/app_strings.h" #include "grit/app_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/event.h" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 1216be0..fd52f72 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/event.h" #include "grit/app_resources.h" diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc index 94c431d..8225589 100644 --- a/views/controls/combobox/native_combobox_win.cc +++ b/views/controls/combobox/native_combobox_win.cc @@ -4,12 +4,12 @@ #include "views/controls/combobox/native_combobox_win.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "gfx/font.h" #include "gfx/native_theme_win.h" #include "ui/base/models/combobox_model.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/combobox/combobox.h" #include "views/widget/widget.h" diff --git a/views/controls/label.cc b/views/controls/label.cc index c54d6dd..e661a61 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -7,7 +7,6 @@ #include <cmath> #include <limits> -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/string_split.h" @@ -17,6 +16,7 @@ #include "gfx/color_utils.h" #include "gfx/font.h" #include "gfx/insets.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/background.h" diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc index c6f8185..a1a07b5 100644 --- a/views/controls/listbox/native_listbox_win.cc +++ b/views/controls/listbox/native_listbox_win.cc @@ -8,9 +8,9 @@ #include <windowsx.h> #include "app/l10n_util_win.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/font.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/listbox/listbox.h" #include "views/widget/widget.h" diff --git a/views/controls/menu/menu_config_gtk.cc b/views/controls/menu/menu_config_gtk.cc index 971490b..e5005f4 100644 --- a/views/controls/menu/menu_config_gtk.cc +++ b/views/controls/menu/menu_config_gtk.cc @@ -4,9 +4,9 @@ #include "views/controls/menu/menu_config.h" -#include "app/resource_bundle.h" #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" namespace views { diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 8c1d1ee..e752ef2 100644 --- a/views/controls/menu/menu_item_view_gtk.cc +++ b/views/controls/menu/menu_item_view_gtk.cc @@ -4,12 +4,12 @@ #include "views/controls/menu/menu_item_view.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" #include "grit/app_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/radio_button_image_gtk.h" diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc index 56a78b8..9f950fa 100644 --- a/views/controls/resize_area.cc +++ b/views/controls/resize_area.cc @@ -4,8 +4,8 @@ #include "views/controls/resize_area.h" -#include "app/resource_bundle.h" #include "base/logging.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_LINUX) #include "gfx/gtk_util.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index 8abc73c..ed97ea2 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -7,12 +7,12 @@ #include <vssym32.h> #include "app/l10n_util_win.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "gfx/native_theme_win.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/fill_layout.h" #include "views/widget/root_view.h" diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index e3bb7a8..940ca36 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -11,7 +11,6 @@ #include "app/l10n_util.h" #include "app/l10n_util_win.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "gfx/canvas_skia.h" @@ -22,6 +21,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorFilter.h" #include "ui/base/models/table_model.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/controls/native/native_view_host.h" #include "views/controls/table/table_view_observer.h" diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc index ee49d06..4a3e17e 100644 --- a/views/controls/throbber.cc +++ b/views/controls/throbber.cc @@ -4,11 +4,11 @@ #include "views/controls/throbber.h" -#include "app/resource_bundle.h" #include "base/time.h" #include "gfx/canvas.h" #include "grit/app_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" using base::Time; using base::TimeDelta; diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 779c054..2f77449 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util_win.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/stl_util-inl.h" @@ -20,6 +19,7 @@ #include "grit/app_resources.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/focus/focus_manager.h" #include "views/widget/widget.h" diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 97cdb25..23622ae 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -4,7 +4,6 @@ #include "views/drag_utils.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" @@ -13,6 +12,7 @@ #include "googleurl/src/gurl.h" #include "grit/app_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" using ui::OSExchangeData; diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index 7b4b055..a49015e 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -5,11 +5,12 @@ #include "views/examples/examples_main.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" #include "base/process_util.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #include "views/controls/label.h" #include "views/controls/button/text_button.h" #include "views/examples/button_example.h" @@ -57,6 +58,7 @@ void ExamplesMain::Run() { base::AtExitManager exit_manager; app::RegisterPathProvider(); + ui::RegisterPathProvider(); icu_util::Initialize(); diff --git a/views/painter.cc b/views/painter.cc index 2dbcb4d..da73aa6 100644 --- a/views/painter.cc +++ b/views/painter.cc @@ -4,13 +4,13 @@ #include "views/painter.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "gfx/canvas.h" #include "gfx/canvas_skia.h" #include "gfx/insets.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" namespace views { diff --git a/views/run_all_unittests.cc b/views/run_all_unittests.cc index 78ae07a..611a77c 100644 --- a/views/run_all_unittests.cc +++ b/views/run_all_unittests.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/test/test_suite.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" class ViewTestSuite : public base::TestSuite { public: @@ -13,6 +14,7 @@ class ViewTestSuite : public base::TestSuite { protected: virtual void Initialize() { app::RegisterPathProvider(); + ui::RegisterPathProvider(); base::TestSuite::Initialize(); ResourceBundle::InitSharedInstance("en-US"); } diff --git a/views/widget/default_theme_provider.cc b/views/widget/default_theme_provider.cc index df9b0f1..33c0eb0 100644 --- a/views/widget/default_theme_provider.cc +++ b/views/widget/default_theme_provider.cc @@ -4,7 +4,7 @@ #include "views/widget/default_theme_provider.h" -#include "app/resource_bundle.h" +#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "ui/base/win/hwnd_util.h" diff --git a/views/widget/default_theme_provider.h b/views/widget/default_theme_provider.h index d9bdf2d..c407f7d 100644 --- a/views/widget/default_theme_provider.h +++ b/views/widget/default_theme_provider.h @@ -12,7 +12,11 @@ #include "ui/base/theme_provider.h" class Profile; + +namespace ui { class ResourceBundle; +} +using ui::ResourceBundle; namespace views { diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 1b3351c..310f940 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -5,13 +5,13 @@ #include "views/window/custom_frame_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/app_strings.h" +#include "ui/base/resource/resource_bundle.h" #include "views/window/client_view.h" #include "views/window/window_shape.h" #include "views/window/window_delegate.h" diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 365f81b4..3947949 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -15,12 +15,12 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "grit/app_strings.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/standard_layout.h" #include "views/window/dialog_delegate.h" diff --git a/views/window/window.cc b/views/window/window.cc index e8b5ddf..7b175fe 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -4,11 +4,11 @@ #include "views/window/window.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "gfx/font.h" #include "gfx/size.h" #include "ui/base/l10n/l10n_font_util.h" +#include "ui/base/resource/resource_bundle.h" #include "views/widget/widget.h" namespace views { diff --git a/webkit/plugins/ppapi/DEPS b/webkit/plugins/ppapi/DEPS index 884f203..5c56369 100644 --- a/webkit/plugins/ppapi/DEPS +++ b/webkit/plugins/ppapi/DEPS @@ -1,8 +1,8 @@ include_rules = [ - "+app", "+gpu/command_buffer", "+ppapi/c", "+ppapi/shared_impl", "+printing", "+skia", + "+ui/base", ] diff --git a/webkit/plugins/ppapi/ppb_pdf_impl.cc b/webkit/plugins/ppapi/ppb_pdf_impl.cc index 364e9c3..cf0d1d0 100644 --- a/webkit/plugins/ppapi/ppb_pdf_impl.cc +++ b/webkit/plugins/ppapi/ppb_pdf_impl.cc @@ -4,7 +4,6 @@ #include "webkit/plugins/ppapi/ppb_pdf_impl.h" -#include "app/resource_bundle.h" #include "base/metrics/histogram.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" @@ -14,6 +13,7 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/private/ppb_pdf.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/usearch.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_gtk.cc index 4defd31..eef26fb 100644 --- a/webkit/support/platform_support_gtk.cc +++ b/webkit/support/platform_support_gtk.cc @@ -4,7 +4,6 @@ #include "webkit/support/platform_support.h" -#include "app/data_pack.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" @@ -13,11 +12,12 @@ #include "base/string_piece.h" #include "gfx/gfx_module.h" #include "grit/webkit_resources.h" +#include "ui/base/resource/data_pack.h" namespace { // Data resources on linux. This is a pointer to the mmapped resources file. -app::DataPack* g_resource_data_pack = NULL; +ui::DataPack* g_resource_data_pack = NULL; base::StringPiece TestResourceProvider(int resource_id) { base::StringPiece res; @@ -39,7 +39,7 @@ void BeforeInitialize(bool unit_test_mode) { void AfterInitialize(bool unit_test_mode) { if (unit_test_mode) return; // We don't have a resource pack when running the unit-tests. - g_resource_data_pack = new app::DataPack; + g_resource_data_pack = new ui::DataPack; FilePath data_path; PathService::Get(base::DIR_EXE, &data_path); data_path = data_path.Append("DumpRenderTree.pak"); diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index d44195e..54319da 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -8,7 +8,6 @@ #import <Foundation/Foundation.h> #import <objc/objc-runtime.h> -#include "app/data_pack.h" #include "base/base_paths.h" #include "base/file_util.h" #include "base/logging.h" @@ -17,11 +16,12 @@ #include "base/string16.h" #include "grit/webkit_resources.h" #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h" +#include "ui/base/resource/data_pack.h" #include "webkit/plugins/npapi/plugin_list.h" #import "webkit/support/drt_application_mac.h" #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h" -static app::DataPack* g_resource_data_pack = NULL; +static ui::DataPack* g_resource_data_pack = NULL; namespace webkit_support { @@ -102,7 +102,7 @@ void AfterInitialize(bool unit_test_mode) { return; // We don't have a resource pack when running the unit-tests. // Load a data pack. - g_resource_data_pack = new app::DataPack; + g_resource_data_pack = new ui::DataPack; NSString* resource_path = [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree" ofType:@"pak"]; diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 7c9b0cc..8c5e7a1 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -11,7 +11,6 @@ #include <signal.h> #include <unistd.h> -#include "app/data_pack.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -26,6 +25,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/data_pack.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webkit_glue.h" @@ -45,7 +45,7 @@ const FcChar8* FilePathAsFcChar(const FilePath& path) { } // Data resources on linux. This is a pointer to the mmapped resources file. -app::DataPack* g_resource_data_pack = NULL; +ui::DataPack* g_resource_data_pack = NULL; void TerminationSignalHandler(int signatl) { TestShell::ShutdownTestShell(); @@ -159,7 +159,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode, web_prefs_ = new WebPreferences; - g_resource_data_pack = new app::DataPack; + g_resource_data_pack = new ui::DataPack; FilePath data_path; PathService::Get(base::DIR_EXE, &data_path); data_path = data_path.Append("test_shell.pak"); diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 9378bea..7fed43c 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -9,7 +9,6 @@ #include "webkit/tools/test_shell/test_shell.h" -#include "app/data_pack.h" #include "base/base_paths.h" #include "base/basictypes.h" #include "base/debug/debugger.h" @@ -30,6 +29,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/resource/data_pack.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" @@ -69,7 +69,7 @@ const int kTestWindowXLocation = -14000; const int kTestWindowYLocation = -14000; // Data pack resource. This is a pointer to the mmapped resources file. -static app::DataPack* g_resource_data_pack = NULL; +static ui::DataPack* g_resource_data_pack = NULL; // Define static member variables base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> > @@ -209,7 +209,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode, // mmap the data pack which holds strings used by WebCore. This is only // a fatal error if we're bundled, which means we might be running layout // tests. This is a harmless failure for test_shell_tests. - g_resource_data_pack = new app::DataPack; + g_resource_data_pack = new ui::DataPack; NSString *resource_path = [base::mac::MainAppBundle() pathForResource:@"test_shell" ofType:@"pak"]; |