Skip to content

Commit

Permalink
ui: Remove unneeded includes of grit/ui_resources.h
Browse files Browse the repository at this point in the history 
Found at first by

  for f in $(ack --cpp -l 'grit/' ui/); do if ! grep -q ID $f; then echo $f; fi; done

Then extended to all folders by using

   git grep -l  grit/ui_resources.h -- '*.cc'

instead of the ack call. Somewhat surprisingly, the latter command didn't
find more than the first.

Also do the same for l10n_util.h and resource_bundle.h using the techniques
described in https://codereview.chromium.org/454583002/

BUG=401588

Review URL: https://codereview.chromium.org/467193003

Cr-Commit-Position: refs/heads/master@{#289470}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289470 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thakis@chromium.org committed Aug 14, 2014
1 parent e198942 commit 2388b9c
Show file tree
Hide file tree
Showing 30 changed files with 1 addition and 35 deletions.
2 changes: 0 additions & 2 deletions ui/app_list/test/app_list_test_model.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

#include "base/memory/scoped_ptr.h"
#include "base/strings/stringprintf.h"
#include "grit/ui_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"

namespace app_list {
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/app_list_background.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "ui/app_list/views/app_list_main_view.h"
#include "ui/app_list/views/contents_view.h"
#include "ui/app_list/views/search_box_view.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/skia_util.h"
Expand Down
2 changes: 0 additions & 2 deletions ui/app_list/views/app_list_menu_views.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

#include "ui/app_list/views/app_list_menu_views.h"

#include "grit/ui_resources.h"
#include "ui/app_list/app_list_view_delegate.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/cached_label.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "base/strings/utf_string_conversions.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/views/widget/widget.h"

Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/contents_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "ui/app_list/views/contents_switcher_view.h"
#include "ui/app_list/views/search_result_list_view.h"
#include "ui/app_list/views/start_page_view.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/events/event.h"
#include "ui/views/view_model.h"
#include "ui/views/view_model_utils.h"
Expand Down
1 change: 0 additions & 1 deletion ui/app_list/views/search_box_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "ui/app_list/speech_ui_model.h"
#include "ui/app_list/views/app_list_menu_views.h"
#include "ui/app_list/views/search_box_view_delegate.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/events/event.h"
#include "ui/views/border.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/cursor/cursor_loader_x11.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <X11/cursorfont.h>

#include "base/logging.h"
#include "grit/ui_resources.h"
#include "skia/ext/image_operations.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/cursor/cursor_util.h"
Expand Down
1 change: 0 additions & 1 deletion ui/base/l10n/time_format_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/formatter.h"
#include "ui/base/resource/resource_bundle.h"

using base::ASCIIToUTF16;

Expand Down
2 changes: 1 addition & 1 deletion ui/file_manager/file_manager_resource_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "ui/file_manager/file_manager_resource_util.h"

#include "base/logging.h"
#include "grit/file_manager_resources_map.h"
#include "ui/base/resource/resource_bundle.h"

namespace file_manager {

Expand Down
1 change: 0 additions & 1 deletion ui/message_center/views/message_center_button_bar.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "grit/ui_resources.h"
#include "grit/ui_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
Expand Down
1 change: 0 additions & 1 deletion ui/message_center/views/message_center_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "grit/ui_resources.h"
#include "grit/ui_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/animation/multi_animation.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/canvas.h"
Expand Down
1 change: 0 additions & 1 deletion ui/message_center/views/message_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image_skia_operations.h"
Expand Down
2 changes: 0 additions & 2 deletions ui/message_center/views/notification_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
#include "grit/ui_resources.h"
#include "grit/ui_strings.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/size.h"
#include "ui/gfx/skia_util.h"
Expand Down
1 change: 0 additions & 1 deletion ui/message_center/views/padded_button.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/message_center/views/padded_button.h"

#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/message_center/message_center_style.h"
Expand Down
1 change: 0 additions & 1 deletion ui/shell_dialogs/select_file_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "build/build_config.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/shell_dialogs/select_file_dialog_factory.h"
#include "ui/shell_dialogs/select_file_policy.h"
#include "ui/shell_dialogs/selected_file_info.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/bubble/tray_bubble_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "third_party/skia/include/effects/SkBlurImageFilter.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_delegate.h"
#include "ui/events/event.h"
Expand Down
2 changes: 0 additions & 2 deletions ui/views/controls/button/label_button.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#include "ui/views/controls/button/label_button.h"

#include "base/logging.h"
#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/animation/throb_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/label.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/insets.h"
Expand Down
2 changes: 0 additions & 2 deletions ui/views/controls/menu/menu_config_mac.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

#include "ui/views/controls/menu/menu_config.h"

#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/native_theme/native_theme_mac.h"
#include "ui/views/controls/menu/menu_image_util.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/menu/menu_controller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "base/time/time.h"
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
#include "ui/gfx/canvas.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/menu/menu_item_view.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/vector2d.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/menu/menu_model_adapter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/views/controls/menu/menu_model_adapter.h"

#include "base/logging.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/menu/menu_item_view.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/menu/menu_model_adapter_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/views/controls/menu/menu_model_adapter.h"

#include "base/strings/utf_string_conversions.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/models/menu_model_delegate.h"
#include "ui/views/controls/menu/menu_item_view.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/resize_area.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "base/logging.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/controls/resize_area_delegate.h"
#include "ui/views/native_cursor.h"

Expand Down
1 change: 0 additions & 1 deletion ui/views/controls/textfield/textfield.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "ui/base/cursor/cursor.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/drag_utils.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches_util.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/events/event.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/corewm/tooltip_aura.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "base/strings/string_split.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/screen.h"
#include "ui/gfx/text_elider.h"
#include "ui/gfx/text_utils.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/corewm/tooltip_aura_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "base/strings/utf_string_conversions.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/font_list.h"
#include "ui/gfx/text_elider.h"
#include "ui/gfx/text_utils.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/corewm/tooltip_controller_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/events/test/event_generator.h"
#include "ui/gfx/font.h"
#include "ui/gfx/point.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/examples/text_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "ui/views/examples/text_example.h"

#include "base/strings/utf_string_conversions.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
#include "ui/views/border.h"
Expand Down
1 change: 0 additions & 1 deletion ui/views/window/frame_background.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "ui/views/window/frame_background.h"

#include "grit/ui_resources.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/theme_provider.h"
Expand Down

0 comments on commit 2388b9c

Please sign in to comment.