roll back r15177

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15191 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 1 insertions, 13 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 815d2ac..131d9e0 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -27,7 +27,6 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 912e25f..9c38f12 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -20,7 +20,6 @@
 #include "chrome/views/controls/text_field.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 
 using views::ComboBox;
 using views::ColumnSet;
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 855d89b..0b00f6a 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -17,7 +17,6 @@
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "grit/views_strings.h"
 #include "net/url_request/url_request_context.h"
 
 using base::Time;
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index dfa5a32..bd58c47 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -34,7 +34,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 #include "net/base/net_util.h"
 
 using base::TimeDelta;
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index d2dda5f..8173849 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -22,7 +22,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 using views::GridLayout;
 using views::ImageView;
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 5a00d51..6039045 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -63,7 +63,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "grit/webkit_resources.h"
 
 
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 4d87db7..770245f 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -11,7 +11,6 @@
 #include "chrome/views/window/client_view.h"
 #include "chrome/views/window/window_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 957cc1d..567b615 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -19,7 +19,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 // An enumeration of bitmap resources used by this window.
 enum {
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 7a07810..7263505 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -27,7 +27,7 @@
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/widget/widget.h"
 #include "grit/generated_resources.h"
-#include "grit/views_resources.h"
+#include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 7a5d10f..e9728cb 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -10,7 +10,6 @@
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/views_strings.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, public:
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index cbc3b77..e9da07e 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -16,7 +16,6 @@
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 
 static bool g_initialized = false;
 static SkBitmap* g_default_fav_icon = NULL;
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index d8d74b2..107af980 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -20,7 +20,6 @@
 #include "chrome/views/window/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_resources.h"
 #include "skia/ext/image_operations.h"
 
 static const int kLeftPadding = 16;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index a6f38f2..81ea797 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -52,7 +52,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/views_strings.h"
 #include "net/base/net_util.h"
 
 static const int kControlHorizOffset = 4;