From 5a2b9c10a72928624288f61237e684009da2d683 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 21 May 2009 03:08:16 +0000 Subject: Revert 16567. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16575 0039d316-1c4b-4281-b951-d872f2087c98 --- views/DEPS | 3 ++- views/controls/button/menu_button.cc | 2 +- views/controls/button/text_button.cc | 2 +- views/controls/scroll_view.cc | 1 + views/controls/throbber.cc | 2 +- views/controls/tree/tree_view.cc | 2 +- views/drag_utils.cc | 2 +- views/views.gyp | 15 ++++++++++++++- views/window/custom_frame_view.cc | 2 +- 9 files changed, 23 insertions(+), 8 deletions(-) (limited to 'views') diff --git a/views/DEPS b/views/DEPS index fab173b..65bf36c 100644 --- a/views/DEPS +++ b/views/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+app", "+grit/app_strings.h", - "+grit/app_resources.h", + # TODO(beng): swap these with app/views specific generated resources. + "+grit/theme_resources.h", "+skia/ext", ] diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index b7e1f8f..fdb28c0 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -10,7 +10,7 @@ #include "app/resource_bundle.h" #include "app/win_util.h" #include "grit/app_strings.h" -#include "grit/app_resources.h" +#include "grit/theme_resources.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 e468e9e..9bf9e24 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -10,7 +10,7 @@ #include "app/resource_bundle.h" #include "views/controls/button/button.h" #include "views/event.h" -#include "grit/app_resources.h" +#include "grit/theme_resources.h" namespace views { diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc index ecc3033..680b623 100644 --- a/views/controls/scroll_view.cc +++ b/views/controls/scroll_view.cc @@ -6,6 +6,7 @@ #include "app/resource_bundle.h" #include "base/logging.h" +#include "grit/theme_resources.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/widget/root_view.h" diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc index 2a4e324..e15fcb3 100644 --- a/views/controls/throbber.cc +++ b/views/controls/throbber.cc @@ -7,7 +7,7 @@ #include "app/gfx/canvas.h" #include "app/resource_bundle.h" #include "base/time.h" -#include "grit/app_resources.h" +#include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" using base::Time; diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 4aebad7..ceaa461 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -15,7 +15,7 @@ #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/win_util.h" -#include "grit/app_resources.h" +#include "grit/theme_resources.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 009fc47..17ba99b 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -18,7 +18,7 @@ #include "base/gfx/point.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" +#include "grit/theme_resources.h" #include "views/controls/button/text_button.h" namespace drag_utils { diff --git a/views/views.gyp b/views/views.gyp index dff1b66..d65a102 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -44,7 +44,6 @@ 'dependencies': [ '../app/app.gyp:app_base', '../app/app.gyp:app_strings', - '../app/app.gyp:app_resources', '../skia/skia.gyp:skia', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', @@ -261,6 +260,13 @@ 'window/native_frame_view.cc', 'widget/widget_win.cc', ], + # TODO: Move these dependencies to platform-neutral once these + # projects are generated by GYP. + 'dependencies': [ + '../chrome/chrome.gyp:chrome_resources', + '../chrome/chrome.gyp:chrome_strings', + '../chrome/chrome.gyp:theme_resources', + ], }], ['OS=="win"', { 'defines': [ @@ -272,6 +278,13 @@ # TODO(beng): move wtl to src/third_party '../chrome/third_party/wtl/include', ], + # TODO: remove this when chrome_resources/chrome_strings are + # generated by GYP. + # The legacy vcproj we rely on places the grit output in this + # directory, so we need to explicitly add it to our include path. + 'include_dirs': [ + '<(PRODUCT_DIR)/grit_derived_sources', + ], }], ], }, diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index e8fdb0f..35ecb6b 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -13,7 +13,7 @@ #include "app/win_util.h" #include "base/win_util.h" #endif -#include "grit/app_resources.h" +#include "grit/theme_resources.h" #include "views/window/client_view.h" #if defined(OS_LINUX) #include "views/window/hit_test.h" -- cgit v1.1