diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 22:11:00 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 22:11:00 +0000 |
commit | a6483d2d878a688ab9eb7cee97147938e8089968 (patch) | |
tree | b38fd60614f7670f06486e480f5d80876e774696 /chrome/browser/ui/webui | |
parent | 07384f6155f0359d61869589d97267f21f9eb2e9 (diff) | |
download | chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.zip chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.tar.gz chromium_src-a6483d2d878a688ab9eb7cee97147938e8089968.tar.bz2 |
chrome/browser: Migrate from googleurl/ includes to url/ ones. Part 2
BUG=229660
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/18251003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
29 files changed, 30 insertions, 30 deletions
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 6c1765f..864eb3f 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -48,7 +48,6 @@ #include "content/public/common/content_client.h" #include "content/public/common/process_type.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -63,6 +62,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/webui/jstemplate_builder.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" #if defined(ENABLE_THEMES) #include "chrome/browser/ui/webui/theme_source.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 4bcecf7..e918829 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -60,9 +60,9 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_utils.h" #include "extensions/common/constants.h" -#include "googleurl/src/gurl.h" #include "ui/gfx/favicon_size.h" #include "ui/web_dialogs/web_dialog_ui.h" +#include "url/gurl.h" #if !defined(DISABLE_NACL) #include "chrome/browser/ui/webui/nacl_ui.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index e7eeda53..834a9d0 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -17,11 +17,11 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" +#include "url/gurl.h" namespace chromeos { namespace imageburner { diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index 43b770b..7eb604a 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -14,10 +14,10 @@ #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/data_url.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.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 a6c5c9d..3e5a5d6 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -33,7 +33,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -42,6 +41,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/webui/jstemplate_builder.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using chromeos::CellularNetwork; using chromeos::CrosLibrary; 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 cebe5b9..827b4ed 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -21,11 +21,11 @@ #include "chromeos/chromeos_switches.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -#include "googleurl/src/gurl.h" #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 "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index c9de20f..2af46db 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -26,7 +26,6 @@ #include "chrome/common/url_constants.h" #include "content/public/child/image_decoder_utils.h" #include "extensions/common/extension_resource.h" -#include "googleurl/src/gurl.h" #include "grit/component_extension_resources_map.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" @@ -37,6 +36,7 @@ #include "ui/gfx/favicon_size.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" +#include "url/gurl.h" namespace { diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.h b/chrome/browser/ui/webui/extensions/extension_info_ui.h index fd54e31..37843c5 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.h +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_INFO_UI_H_ #include "content/public/browser/web_ui_controller.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" namespace base { diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index 0324406..8dca7d8 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -23,8 +23,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "ui/shell_dialogs/select_file_dialog.h" +#include "url/gurl.h" class ExtensionService; diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 9d7cdab..9e056d0 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -14,7 +14,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/time_format.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -22,6 +21,7 @@ #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/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 486e28e..aacd04b 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -25,7 +25,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_message_handler.h" -#include "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" @@ -39,6 +38,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" using content::BrowserThread; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc b/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc index 5099727..10d4582 100644 --- a/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc +++ b/chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" class PartnerBookmarksShimTest : public testing::Test { public: diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 82c0078..4e79a4c 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -49,13 +49,13 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "content/public/common/favicon_url.h" -#include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/favicon_size.h" #include "ui/webui/web_ui_util.h" +#include "url/gurl.h" using chrome::AppLaunchParams; using chrome::OpenApplication; diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index 954a875a..4acb0c0 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc @@ -6,7 +6,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/web_ui_browsertest.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" class MostVisitedWebUITest : public WebUIBrowserTest { public: diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index 5574ceb..e6f5966 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -42,11 +42,11 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc index af1b8c2..b64bdad 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler_browsertest.cc @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" +#include "url/gurl.h" using ::testing::_; diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 6a7f072..b64eace 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -16,7 +16,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::OpenURLParams; using content::Referrer; diff --git a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc index 661e39e..4f2552b 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc @@ -34,7 +34,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index a1767d7..f9321a5 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -14,10 +14,10 @@ #include "chrome/browser/thumbnails/thumbnail_service.h" #include "chrome/browser/thumbnails/thumbnail_service_factory.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "net/url_request/url_request.h" #include "ui/base/resource/resource_bundle.h" +#include "url/gurl.h" using content::BrowserThread; 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 2de2418..daea354 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 @@ -28,7 +28,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" #include "content/public/common/url_constants.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/data_url.h" @@ -36,6 +35,7 @@ #include "ui/base/resource/resource_bundle.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/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 24140bd..47133ee 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -10,11 +10,11 @@ #include "chrome/browser/chromeos/login/default_user_images.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/url_parse.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/codec/png_codec.h" #include "ui/webui/web_ui_util.h" +#include "url/url_parse.h" namespace { diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index e063533..20b6ac3 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -23,12 +23,12 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using content::UserMetricsAction; diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index da6b08d..e8cd583 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -28,9 +28,9 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" #if defined(OS_CHROMEOS) #include "base/strings/stringprintf.h" diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc index 2d8193f..2ef1ec3 100644 --- a/chrome/browser/ui/webui/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc @@ -17,12 +17,12 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" using testing::AnyNumber; using testing::Return; diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h index a559782..0c70a45 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_types.h +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_types.h @@ -9,7 +9,7 @@ #include <string> #include "base/time/time.h" -#include "googleurl/src/gurl.h" +#include "url/gurl.h" #include "webkit/common/quota/quota_types.h" namespace base { diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index f416fc7..f4414f8 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -23,8 +23,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "googleurl/src/url_canon.h" -#include "googleurl/src/url_util.h" +#include "url/url_canon.h" +#include "url/url_util.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 8222132..5c7f8c6 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -17,11 +17,11 @@ #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" -#include "googleurl/src/gurl.h" #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 "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc index c469d18..d6064fe 100644 --- a/chrome/browser/ui/webui/version_handler.cc +++ b/chrome/browser/ui/webui/version_handler.cc @@ -14,9 +14,9 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_ui.h" -#include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "url/gurl.h" #include "webkit/plugins/plugin_constants.h" namespace { diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 9749e76..2caef65 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -19,10 +19,10 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" #include "content/public/test/web_contents_tester.h" -#include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" +#include "url/gurl.h" using content::OpenURLParams; using content::Referrer; |