diff options
64 files changed, 89 insertions, 88 deletions
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc index 11b22bb..443ccf0 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc @@ -11,7 +11,7 @@ #include "grit/app_locale_settings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace extensions { diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 34b83aa..412196e 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -29,7 +29,7 @@ #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" using base::BinaryValue; diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc index e94d786..0ff337a 100644 --- a/chrome/browser/chromeos/login/merge_session_load_page.cc +++ b/chrome/browser/chromeos/login/merge_session_load_page.cc @@ -33,7 +33,7 @@ #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" using content::BrowserThread; using content::InterstitialPage; diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc index c2df197..42fea1f 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc @@ -25,8 +25,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/image/image_skia.h" -#include "ui/webui/web_ui_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.cc b/chrome/browser/chromeos/login/user_image_manager_impl.cc index 93ddf9d..aeddcdc 100644 --- a/chrome/browser/chromeos/login/user_image_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_image_manager_impl.cc @@ -34,8 +34,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/image/image_skia.h" -#include "ui/webui/web_ui_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index e88dde2..9520729 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -41,8 +41,8 @@ #include "net/base/net_errors.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::BrowserThread; using content::InterstitialPage; diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 930db7d..c77899b 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -34,7 +34,7 @@ #include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #if defined(OS_WIN) #include "win8/util/win8_util.h" diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 3f594d6..bd92c26 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -62,7 +62,7 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 58063bc7..f172419 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -79,7 +79,7 @@ #include "net/http/http_util.h" #include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" using content::BrowserContext; using content::BrowserThread; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index e9d0c7d..fa7d347 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -15,7 +15,7 @@ #include "chrome/browser/feedback/tracing_manager.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/url_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/identity_private/identity_private_api.cc b/chrome/browser/extensions/api/identity_private/identity_private_api.cc index d1e3270..78d63a2 100644 --- a/chrome/browser/extensions/api/identity_private/identity_private_api.cc +++ b/chrome/browser/extensions/api/identity_private/identity_private_api.cc @@ -10,7 +10,7 @@ #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index ca6f472..18bcbeb 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -102,7 +102,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "sync/api/sync_change.h" #include "sync/api/sync_error_factory.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" #include "webkit/browser/database/database_tracker.h" #include "webkit/browser/database/database_util.h" diff --git a/chrome/browser/managed_mode/managed_mode_interstitial.cc b/chrome/browser/managed_mode/managed_mode_interstitial.cc index 4d31b3e..39dd780 100644 --- a/chrome/browser/managed_mode/managed_mode_interstitial.cc +++ b/chrome/browser/managed_mode/managed_mode_interstitial.cc @@ -28,8 +28,8 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::BrowserThread; diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 6027d00..b671fbd 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -44,9 +44,9 @@ #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/message_center/message_center_util.h" #include "ui/message_center/notifier_settings.h" -#include "ui/webui/web_ui_util.h" #if defined(OS_CHROMEOS) #include "ash/system/system_notifier.h" diff --git a/chrome/browser/notifications/notification.cc b/chrome/browser/notifications/notification.cc index 1fa65cc..498ce1d 100644 --- a/chrome/browser/notifications/notification.cc +++ b/chrome/browser/notifications/notification.cc @@ -6,8 +6,8 @@ #include "base/strings/string_util.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/message_center/message_center_util.h" -#include "ui/webui/web_ui_util.h" Notification::Notification(const GURL& origin_url, const GURL& content_url, diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 2cfbd67..8506e4f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -41,8 +41,8 @@ #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::BrowserThread; using content::InterstitialPage; diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 0ec9c9a..3669372 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -23,7 +23,7 @@ #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 8ed4363..056321f 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -33,7 +33,7 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 520b951..c100073 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -37,8 +37,8 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/jstemplate_builder.h" #include "ui/gfx/image/image.h" -#include "ui/webui/jstemplate_builder.h" #if defined(OS_WIN) #include "base/win/metro.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 9704386..3cd6806 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -59,8 +59,8 @@ #include "net/url_request/url_request_status.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" #if defined(ENABLE_THEMES) diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc index 604a3bb..d89b207 100644 --- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc +++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc @@ -10,7 +10,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "grit/browser_resources.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc index c0626bf..d472ad0 100644 --- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc @@ -12,7 +12,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc index bded6ac..0ab33ed 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc @@ -18,7 +18,7 @@ #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc index a0564bd..e3882af 100644 --- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc @@ -22,7 +22,7 @@ #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index b220e31..e3d6728 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -15,10 +15,10 @@ #include "chromeos/network/network_state_handler.h" #include "content/public/browser/web_ui.h" #include "ui/base/models/menu_model.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/font.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/webui/web_ui_util.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 6f7ac6d..ee8a8a5 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -48,7 +48,7 @@ #include "content/public/browser/web_ui_data_source.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index a081821..6a8bf23 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -45,8 +45,8 @@ #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" using chromeos::MobileActivator; diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index d26b02e..c46dfc6 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -20,8 +20,8 @@ #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 2354816..e46177a 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -37,8 +37,8 @@ #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::BrowserThread; using content::WebContents; diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc index ddf64c4..9740836 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc @@ -21,8 +21,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc index 45a41a0..b5656e1 100644 --- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc +++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc @@ -34,8 +34,8 @@ #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index 460f1bb..d18f24d 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -24,7 +24,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 5d6d6ff..12ddab0 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -22,7 +22,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" FaviconSource::IconRequest::IconRequest() : size_in_dip(gfx::kFaviconSize), diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 1705c41..5d57416 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -16,10 +16,10 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/webui/web_ui_util.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc index 8bd8e66..6a1affc 100644 --- a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc +++ b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc @@ -21,8 +21,8 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" using chrome::VersionInfo; using content::BrowserThread; diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 05ce5cf..2420bc5 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -51,8 +51,8 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/favicon_size.h" -#include "ui/webui/web_ui_util.h" #include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index daed59b..0602d2b 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -36,7 +36,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" namespace browser_sync { diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index a0d83a5..35a31b0 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -42,9 +42,9 @@ #include "net/base/escape.h" #include "skia/ext/image_operations.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" -#include "ui/webui/web_ui_util.h" using content::OpenURLParams; using content::Referrer; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 2d5df7a..fe38435 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -51,11 +51,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/animation/animation.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/sys_color_change_listener.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc index 65db9ca..9704e6a 100644 --- a/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc +++ b/chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.cc @@ -16,7 +16,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #if defined(OS_ANDROID) #include "chrome/browser/sessions/session_restore.h" diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index f2dad23..95cff5e 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc @@ -29,7 +29,7 @@ #include "grit/component_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" using autofill::AutofillCountry; using autofill::ServerFieldType; diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 1a02135..27ba092 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -88,7 +88,7 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #if !defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/options/advanced_options_utils.h" diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index 537feab..be477ce 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -33,8 +33,8 @@ #include "net/base/data_url.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/views/widget/widget.h" -#include "ui/webui/web_ui_util.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index cd32787..8d4045d 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -78,11 +78,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/display.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" -#include "ui/webui/web_ui_util.h" namespace chromeos { namespace options { diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index 5673215..345e58b 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -37,7 +37,7 @@ #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #if defined(ENABLE_SETTINGS_APP) #include "chrome/browser/ui/app_list/app_list_service.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 3d7b8ae..cf3e584 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -62,8 +62,8 @@ #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/system/pointer_device_observer.h" diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc index 0c76182..5fa8b1b 100644 --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc @@ -26,8 +26,8 @@ #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/image/image_util.h" -#include "ui/webui/web_ui_util.h" #if defined(ENABLE_MANAGED_USERS) #include "chrome/browser/managed_mode/managed_user_service.h" diff --git a/chrome/browser/ui/webui/signin/user_manager_ui.cc b/chrome/browser/ui/webui/signin/user_manager_ui.cc index c26423f..0f3e24c 100644 --- a/chrome/browser/ui/webui/signin/user_manager_ui.cc +++ b/chrome/browser/ui/webui/signin/user_manager_ui.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_ui_data_source.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" // JS file names. const char kStringsJSPath[] = "strings.js"; diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc index 8ba6cef..15cff48 100644 --- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc @@ -17,8 +17,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/image/image_skia.h" -#include "ui/webui/web_ui_util.h" #include "webkit/common/webpreferences.h" namespace { diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index c58a586..b161177 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -20,7 +20,7 @@ #include "net/url_request/url_request.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/common/favicon/favicon_url_parser.cc b/chrome/common/favicon/favicon_url_parser.cc index e09a870..ef6999e 100644 --- a/chrome/common/favicon/favicon_url_parser.cc +++ b/chrome/common/favicon/favicon_url_parser.cc @@ -8,8 +8,8 @@ #include "chrome/common/favicon/favicon_types.h" #include "net/url_request/url_request.h" #include "ui/base/layout.h" +#include "ui/base/webui/web_ui_util.h" #include "ui/gfx/favicon_size.h" -#include "ui/webui/web_ui_util.h" namespace { diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc index fe9b2fe..73b62a5 100644 --- a/chrome/common/localized_error.cc +++ b/chrome/common/localized_error.cc @@ -23,7 +23,7 @@ #include "net/base/net_util.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "url/gurl.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc index a89cd85..428f9c2 100644 --- a/chrome/common/net/net_resource_provider.cc +++ b/chrome/common/net/net_resource_provider.cc @@ -14,7 +14,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" namespace { diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 8672dcc..b86f250 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -98,7 +98,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. #if defined(ENABLE_WEBRTC) diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index 0e58e72..e15d23c 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -38,7 +38,7 @@ #include "third_party/re2/re2/re2.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" using content::RenderThread; using content::RenderView; diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index 9d0d171..624a438 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -10,8 +10,8 @@ #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "content/public/common/content_client.h" -#include "ui/webui/jstemplate_builder.h" -#include "ui/webui/web_ui_util.h" +#include "ui/base/webui/jstemplate_builder.h" +#include "ui/base/webui/web_ui_util.h" namespace content { diff --git a/ui/base/DEPS b/ui/base/DEPS index 076b465..fc943f4 100644 --- a/ui/base/DEPS +++ b/ui/base/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+grit/ui_resources.h", "+grit/ui_unscaled_resources.h", "+grit/ui_strings.h", + "+grit/webui_resources.h", "+net", "+skia/ext", "+third_party/skia", diff --git a/ui/webui/jstemplate_builder.cc b/ui/base/webui/jstemplate_builder.cc index 681afbc..26af7fe 100644 --- a/ui/webui/jstemplate_builder.cc +++ b/ui/base/webui/jstemplate_builder.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. // A helper function for using JsTemplate. See jstemplate_builder.h for more // info. -#include "ui/webui/jstemplate_builder.h" +#include "ui/base/webui/jstemplate_builder.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" diff --git a/ui/webui/jstemplate_builder.h b/ui/base/webui/jstemplate_builder.h index 6a27ee8..66b265a 100644 --- a/ui/webui/jstemplate_builder.h +++ b/ui/base/webui/jstemplate_builder.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. @@ -10,8 +10,8 @@ // - given a json data object, run the jstemplate javascript which fills in // template values -#ifndef UI_WEBUI_JSTEMPLATE_BUILDER_H_ -#define UI_WEBUI_JSTEMPLATE_BUILDER_H_ +#ifndef UI_BASE_WEBUI_JSTEMPLATE_BUILDER_H_ +#define UI_BASE_WEBUI_JSTEMPLATE_BUILDER_H_ #include <string> @@ -88,4 +88,4 @@ UI_EXPORT void AppendI18nTemplateProcessHtml(std::string* output); } // namespace webui -#endif // UI_WEBUI_JSTEMPLATE_BUILDER_H_ +#endif // UI_BASE_WEBUI_JSTEMPLATE_BUILDER_H_ diff --git a/ui/webui/web_ui_util.cc b/ui/base/webui/web_ui_util.cc index 1fda351..d901491 100644 --- a/ui/webui/web_ui_util.cc +++ b/ui/base/webui/web_ui_util.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include <vector> diff --git a/ui/webui/web_ui_util.h b/ui/base/webui/web_ui_util.h index a3d297c..72afec6 100644 --- a/ui/webui/web_ui_util.h +++ b/ui/base/webui/web_ui_util.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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_WEBUI_WEB_UI_UTIL_H_ -#define UI_WEBUI_WEB_UI_UTIL_H_ +#ifndef UI_BASE_WEBUI_WEB_UI_UTIL_H_ +#define UI_BASE_WEBUI_WEB_UI_UTIL_H_ #include <string> @@ -57,4 +57,4 @@ UI_EXPORT void SetFontAndTextDirection( } // namespace webui -#endif // UI_WEBUI_WEB_UI_UTIL_H_ +#endif // UI_BASE_WEBUI_WEB_UI_UTIL_H_ diff --git a/ui/webui/web_ui_util_unittest.cc b/ui/base/webui/web_ui_util_unittest.cc index 56494c9..59ed4a5 100644 --- a/ui/webui/web_ui_util_unittest.cc +++ b/ui/base/webui/web_ui_util_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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/webui/web_ui_util.h" +#include "ui/base/webui/web_ui_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -279,6 +279,10 @@ 'base/ui_export.h', 'base/view_prop.cc', 'base/view_prop.h', + 'base/webui/jstemplate_builder.cc', + 'base/webui/jstemplate_builder.h', + 'base/webui/web_ui_util.cc', + 'base/webui/web_ui_util.h', 'base/win/accessibility_ids_win.h', 'base/win/accessibility_misc_utils.cc', 'base/win/accessibility_misc_utils.h', @@ -321,10 +325,6 @@ 'base/x/x11_util.cc', 'base/x/x11_util.h', 'base/x/x11_util_internal.h', - 'webui/jstemplate_builder.cc', - 'webui/jstemplate_builder.h', - 'webui/web_ui_util.cc', - 'webui/web_ui_util.h', ], 'target_conditions': [ ['OS == "ios"', { diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 2be62e4..f1e876d 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -167,6 +167,7 @@ 'base/test/data/resource.h', 'base/text/bytes_formatting_unittest.cc', 'base/view_prop_unittest.cc', + 'base/webui/web_ui_util_unittest.cc', 'events/event_dispatcher_unittest.cc', 'events/event_unittest.cc', 'events/latency_info_unittest.cc', @@ -186,7 +187,6 @@ 'gfx/transform_util_unittest.cc', 'gfx/utf16_indexing_unittest.cc', 'shell_dialogs/select_file_dialog_win_unittest.cc', - 'webui/web_ui_util_unittest.cc', ], 'include_dirs': [ '../', |