summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 22:47:04 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 22:47:04 +0000
commita93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11 (patch)
treee90b2a35b09d32eba123f1f84451142427d9ec0b /views/controls
parent074f105692a4783df43d1d1a68bb866a51e5b66b (diff)
downloadchromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.zip
chromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.tar.gz
chromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.tar.bz2
Parts of my previous changelist didn't make it through.
http://crbug.com/11387 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/button/menu_button.cc2
-rw-r--r--views/controls/button/text_button.cc2
-rw-r--r--views/controls/scroll_view.cc1
-rw-r--r--views/controls/throbber.cc2
-rw-r--r--views/controls/tree/tree_view.cc2
5 files changed, 4 insertions, 5 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index fdb28c0..b7e1f8f 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/theme_resources.h"
+#include "grit/app_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 9bf9e24..e468e9e 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/theme_resources.h"
+#include "grit/app_resources.h"
namespace views {
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index 680b623..ecc3033 100644
--- a/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -6,7 +6,6 @@
#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 e15fcb3..2a4e324 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/theme_resources.h"
+#include "grit/app_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 ceaa461..4aebad7 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/theme_resources.h"
+#include "grit/app_resources.h"
#include "views/focus/focus_manager.h"
#include "views/widget/widget.h"