summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 23:04:27 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-12 23:04:27 +0000
commit0790a8416ddd02e55d18717e1bd422cb2561c530 (patch)
tree425e7349f0873c803e432f27199820b0e99be89b /chrome/browser/views
parentdbdde8f24205b7931388b7880cd525a0e1057df9 (diff)
downloadchromium_src-0790a8416ddd02e55d18717e1bd422cb2561c530.zip
chromium_src-0790a8416ddd02e55d18717e1bd422cb2561c530.tar.gz
chromium_src-0790a8416ddd02e55d18717e1bd422cb2561c530.tar.bz2
Clean up app_resources.grd:
* Alphabetize a couple entries * Move things to theme_resources.grd where possible * Scope things only used by views under an appropriate conditional BUG=none TEST=none Review URL: http://codereview.chromium.org/2953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/autofill_profiles_view_win.cc1
-rw-r--r--chrome/browser/views/infobars/infobar_button_border.cc2
-rw-r--r--chrome/browser/views/infobars/translate_infobar_base.cc2
-rw-r--r--chrome/browser/views/options/exception_editor_view.cc1
4 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 4468999..1008c49 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -27,6 +27,7 @@
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
#include "views/border.h"
#include "views/controls/button/image_button.h"
#include "views/controls/button/native_button.h"
diff --git a/chrome/browser/views/infobars/infobar_button_border.cc b/chrome/browser/views/infobars/infobar_button_border.cc
index c52a2bb..7a0ad9d 100644
--- a/chrome/browser/views/infobars/infobar_button_border.cc
+++ b/chrome/browser/views/infobars/infobar_button_border.cc
@@ -7,7 +7,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "gfx/canvas.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
#include "views/controls/button/text_button.h"
// Preferred padding between text and edge
diff --git a/chrome/browser/views/infobars/translate_infobar_base.cc b/chrome/browser/views/infobars/translate_infobar_base.cc
index e80910b..1527c0b 100644
--- a/chrome/browser/views/infobars/translate_infobar_base.cc
+++ b/chrome/browser/views/infobars/translate_infobar_base.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/views/infobars/translate_message_infobar.h"
#include "chrome/browser/views/infobars/infobar_button_border.h"
#include "gfx/canvas_skia.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
#include "views/controls/button/menu_button.h"
#include "views/controls/image_view.h"
diff --git a/chrome/browser/views/options/exception_editor_view.cc b/chrome/browser/views/options/exception_editor_view.cc
index 2bb8287..88e396b 100644
--- a/chrome/browser/views/options/exception_editor_view.cc
+++ b/chrome/browser/views/options/exception_editor_view.cc
@@ -12,6 +12,7 @@
#include "googleurl/src/url_parse.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
#include "views/grid_layout.h"
#include "views/controls/image_view.h"
#include "views/controls/label.h"