From 73e2dc1b122c6422a36a5ca4ccef41355a65430c Mon Sep 17 00:00:00 2001 From: estade Date: Mon, 31 Aug 2015 15:43:31 -0700 Subject: [PATCH] Rename vector icon header files. BUG=509811 Review URL: https://codereview.chromium.org/1321123002 Cr-Commit-Position: refs/heads/master@{#346500} --- chrome/browser/extensions/extension_icon_manager.cc | 2 +- chrome/browser/permissions/permission_bubble_request_impl.cc | 2 +- .../ui/content_settings/content_setting_image_model.cc | 2 +- chrome/browser/ui/tabs/tab_utils.cc | 2 +- chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc | 2 +- chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc | 2 +- chrome/browser/ui/views/autofill/tooltip_icon.cc | 2 +- .../ui/views/download/download_started_animation_views.cc | 4 ++-- .../ui/views/extensions/extension_install_dialog_view.cc | 2 +- chrome/browser/ui/views/find_bar_view.cc | 2 +- chrome/browser/ui/views/location_bar/translate_icon_view.cc | 2 +- chrome/browser/ui/views/profiles/new_avatar_button.cc | 2 +- chrome/browser/ui/views/profiles/profile_chooser_view.cc | 2 +- .../ui/views/website_settings/permissions_bubble_view.cc | 2 +- .../browser/ui/website_settings/permission_bubble_request.cc | 2 +- ui/gfx/BUILD.gn | 4 ++-- ui/gfx/gfx.gyp | 11 ++--------- ui/gfx/paint_vector_icon.cc | 2 +- ui/gfx/vector_icons/vector_icons.cc.template | 2 +- ui/gfx/vector_icons/vector_icons.h.template | 2 +- ui/gfx/{vector_icons_public2.h => vector_icons_public.h} | 2 +- ui/views/controls/throbber.cc | 2 +- ui/views/examples/vector_example.cc | 2 +- 23 files changed, 26 insertions(+), 33 deletions(-) rename ui/gfx/{vector_icons_public2.h => vector_icons_public.h} (94%) diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index d1b58fdf859c..05972a6e55b6 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -23,7 +23,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/skbitmap_operations.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" diff --git a/chrome/browser/permissions/permission_bubble_request_impl.cc b/chrome/browser/permissions/permission_bubble_request_impl.cc index 35673842210a..870a5c7b011f 100644 --- a/chrome/browser/permissions/permission_bubble_request_impl.cc +++ b/chrome/browser/permissions/permission_bubble_request_impl.cc @@ -11,7 +11,7 @@ #include "grit/theme_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" PermissionBubbleRequestImpl::PermissionBubbleRequestImpl( const GURL& request_origin, diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc index 6a9e0a817347..6adb4c504fa6 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc @@ -17,7 +17,7 @@ #if !defined(OS_MACOSX) #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #endif diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc index 53cca87861ec..09f63b0b3fff 100644 --- a/chrome/browser/ui/tabs/tab_utils.cc +++ b/chrome/browser/ui/tabs/tab_utils.cc @@ -18,7 +18,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/animation/multi_animation.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index f285ee8da4a5..53a757b87f2e 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -37,7 +37,7 @@ #if !defined(OS_MACOSX) #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #endif diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc index 48739c8662d3..3f3fe52966a4 100644 --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc @@ -27,7 +27,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/views/background.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/combobox/combobox.h" diff --git a/chrome/browser/ui/views/autofill/tooltip_icon.cc b/chrome/browser/ui/views/autofill/tooltip_icon.cc index 665097bbc693..0aef3c1e749b 100644 --- a/chrome/browser/ui/views/autofill/tooltip_icon.cc +++ b/chrome/browser/ui/views/autofill/tooltip_icon.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/autofill/info_bubble.h" #include "ui/accessibility/ax_view_state.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/mouse_watcher_view_host.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc index 3a6b5565026d..242a6a114c5d 100644 --- a/chrome/browser/ui/views/download/download_started_animation_views.cc +++ b/chrome/browser/ui/views/download/download_started_animation_views.cc @@ -10,7 +10,7 @@ #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/image_view.h" @@ -70,7 +70,7 @@ DownloadStartedAnimationViews::DownloadStartedAnimationViews( // If we're too small to show the download image, then don't bother - // the shelf will be enough. - web_contents_bounds_= web_contents->GetContainerBounds(); + web_contents_bounds_ = web_contents->GetContainerBounds(); if (web_contents_bounds_.height() < download_image.height()) return; diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index d9e68a875277..ef87839b0730 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -32,7 +32,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/text_utils.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index ac33df91d897..01c533ba4289 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -31,7 +31,7 @@ #include "ui/events/event.h" #include "ui/gfx/canvas.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #include "ui/resources/grit/ui_resources.h" diff --git a/chrome/browser/ui/views/location_bar/translate_icon_view.cc b/chrome/browser/ui/views/location_bar/translate_icon_view.cc index 4b2b9f687197..2717cf49d243 100644 --- a/chrome/browser/ui/views/location_bar/translate_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/translate_icon_view.cc @@ -14,7 +14,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.cc b/chrome/browser/ui/views/profiles/new_avatar_button.cc index ca26eefb2e75..9b26ca398038 100644 --- a/chrome/browser/ui/views/profiles/new_avatar_button.cc +++ b/chrome/browser/ui/views/profiles/new_avatar_button.cc @@ -15,7 +15,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/views/border.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc index bf30455d624e..f61db462d9c4 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc @@ -53,7 +53,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/text_elider.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #include "ui/views/controls/button/blue_button.h" diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc index 8f271647d81f..9618ad304ed3 100644 --- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc +++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc @@ -25,7 +25,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/gfx/text_constants.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/chrome/browser/ui/website_settings/permission_bubble_request.cc b/chrome/browser/ui/website_settings/permission_bubble_request.cc index a5a2293e06a3..8597f62774cc 100644 --- a/chrome/browser/ui/website_settings/permission_bubble_request.cc +++ b/chrome/browser/ui/website_settings/permission_bubble_request.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/website_settings/permission_bubble_request.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" gfx::VectorIconId PermissionBubbleRequest::GetVectorIconId() const { return gfx::VectorIconId::VECTOR_ICON_NONE; diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index d8994b877231..6406021183a4 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -21,7 +21,7 @@ source_set("gfx_export") { } vector_icons_cc_file = "$target_gen_dir/vector_icons.cc" -vector_icons_h_file = "$target_gen_dir/vector_icons2.h" +vector_icons_h_file = "$target_gen_dir/vector_icons.h" component("gfx") { sources = [ @@ -351,7 +351,7 @@ component("gfx") { "paint_vector_icon.cc", "paint_vector_icon.h", "vector_icon_types.h", - "vector_icons_public2.h", + "vector_icons_public.h", vector_icons_cc_file, vector_icons_h_file, ] diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index f74df18fc624..c6bb8a5f9674 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -473,18 +473,11 @@ 'sources': [ 'paint_vector_icon.cc', 'paint_vector_icon.h', - # The 2 in this file name is intended to get around issues with - # clean-up of generated files: crbug.com/509811 - # TODO(estade): change this back to vector_icons_public.h in a second - # pass. - 'vector_icons_public2.h', + 'vector_icons_public.h', ], 'variables': { 'vector_icons_cc_file': '<(INTERMEDIATE_DIR)/ui/gfx/vector_icons.cc', - # The 2 in this file name is intended to get around issues with - # clean-up of generated files: crbug.com/509811 - # TODO(estade): change this back to vector_icons.h in a second pass. - 'vector_icons_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vector_icons2.h', + 'vector_icons_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vector_icons.h', }, 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', diff --git a/ui/gfx/paint_vector_icon.cc b/ui/gfx/paint_vector_icon.cc index 8251817e42e7..aaeea30f9bfc 100644 --- a/ui/gfx/paint_vector_icon.cc +++ b/ui/gfx/paint_vector_icon.cc @@ -15,7 +15,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/vector_icon_types.h" -#include "ui/gfx/vector_icons2.h" +#include "ui/gfx/vector_icons.h" namespace gfx { diff --git a/ui/gfx/vector_icons/vector_icons.cc.template b/ui/gfx/vector_icons/vector_icons.cc.template index 5a4441466a72..08d597ae2026 100644 --- a/ui/gfx/vector_icons/vector_icons.cc.template +++ b/ui/gfx/vector_icons/vector_icons.cc.template @@ -5,7 +5,7 @@ // vector_icons.cc.template is used to generate vector_icons.cc. Edit the former // rather than the latter. -#include "ui/gfx/vector_icons2.h" +#include "ui/gfx/vector_icons.h" #include "base/logging.h" #include "ui/gfx/vector_icon_types.h" diff --git a/ui/gfx/vector_icons/vector_icons.h.template b/ui/gfx/vector_icons/vector_icons.h.template index 289c89efd998..d89f32c069ae 100644 --- a/ui/gfx/vector_icons/vector_icons.h.template +++ b/ui/gfx/vector_icons/vector_icons.h.template @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// vector_icons.h.template is used to generate vector_icons2.h. Edit the former +// vector_icons.h.template is used to generate vector_icons.h. Edit the former // rather than the latter. #ifndef UI_GFX_VECTOR_ICONS_H_ diff --git a/ui/gfx/vector_icons_public2.h b/ui/gfx/vector_icons_public.h similarity index 94% rename from ui/gfx/vector_icons_public2.h rename to ui/gfx/vector_icons_public.h index 50b19e9c35bd..1df1cb024335 100644 --- a/ui/gfx/vector_icons_public2.h +++ b/ui/gfx/vector_icons_public.h @@ -8,7 +8,7 @@ #include "build/build_config.h" #if defined(USE_AURA) || (!defined(OS_IOS) && !defined(OS_ANDROID)) -#include "ui/gfx/vector_icons2.h" +#include "ui/gfx/vector_icons.h" #else // Define this type so non-views platforms will compile. namespace gfx { diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 6ad3625c7258..635ff88a0bb1 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc @@ -11,7 +11,7 @@ #include "ui/gfx/image/image_skia.h" #include "ui/gfx/paint_throbber.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" #include "ui/resources/grit/ui_resources.h" diff --git a/ui/views/examples/vector_example.cc b/ui/views/examples/vector_example.cc index f01055c21483..a42a0d0e1dc9 100644 --- a/ui/views/examples/vector_example.cc +++ b/ui/views/examples/vector_example.cc @@ -9,7 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "ui/gfx/paint_vector_icon.h" -#include "ui/gfx/vector_icons_public2.h" +#include "ui/gfx/vector_icons_public.h" #include "ui/views/border.h" #include "ui/views/controls/button/blue_button.h" #include "ui/views/controls/button/button.h" -- 2.11.4.GIT