summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/infobarbutton_b_h.pngbin124 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_b_n.pngbin124 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_b_p.pngbin127 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_bl_h.pngbin159 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_bl_n.pngbin156 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_bl_p.pngbin156 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_br_h.pngbin156 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_br_n.pngbin152 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_br_p.pngbin156 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_c_h.pngbin150 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_c_n.pngbin134 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_c_p.pngbin133 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_l_h.pngbin137 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_l_n.pngbin138 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_l_p.pngbin137 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_menu_droparrow.pngbin153 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_r_h.pngbin160 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_r_n.pngbin147 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_r_p.pngbin142 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_t_h.pngbin127 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_t_n.pngbin126 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_t_p.pngbin128 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tl_h.pngbin153 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tl_n.pngbin155 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tl_p.pngbin149 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tr_h.pngbin159 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tr_n.pngbin159 -> 0 bytes
-rw-r--r--chrome/app/theme/infobarbutton_tr_p.pngbin158 -> 0 bytes
-rw-r--r--chrome/app/theme/input_alert.pngbin845 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd33
-rw-r--r--chrome/browser/autofill/autofill_dialog_controller_mac.mm1
-rw-r--r--chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm3
-rw-r--r--chrome/browser/gtk/options/content_exception_editor.cc1
-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
37 files changed, 3 insertions, 41 deletions
diff --git a/chrome/app/theme/infobarbutton_b_h.png b/chrome/app/theme/infobarbutton_b_h.png
deleted file mode 100644
index dbca1b9..0000000
--- a/chrome/app/theme/infobarbutton_b_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_b_n.png b/chrome/app/theme/infobarbutton_b_n.png
deleted file mode 100644
index 9c83bde..0000000
--- a/chrome/app/theme/infobarbutton_b_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_b_p.png b/chrome/app/theme/infobarbutton_b_p.png
deleted file mode 100644
index e8337a7..0000000
--- a/chrome/app/theme/infobarbutton_b_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_bl_h.png b/chrome/app/theme/infobarbutton_bl_h.png
deleted file mode 100644
index b621248..0000000
--- a/chrome/app/theme/infobarbutton_bl_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_bl_n.png b/chrome/app/theme/infobarbutton_bl_n.png
deleted file mode 100644
index b151024..0000000
--- a/chrome/app/theme/infobarbutton_bl_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_bl_p.png b/chrome/app/theme/infobarbutton_bl_p.png
deleted file mode 100644
index 382bb94..0000000
--- a/chrome/app/theme/infobarbutton_bl_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_br_h.png b/chrome/app/theme/infobarbutton_br_h.png
deleted file mode 100644
index 202e335..0000000
--- a/chrome/app/theme/infobarbutton_br_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_br_n.png b/chrome/app/theme/infobarbutton_br_n.png
deleted file mode 100644
index 1b89dd6..0000000
--- a/chrome/app/theme/infobarbutton_br_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_br_p.png b/chrome/app/theme/infobarbutton_br_p.png
deleted file mode 100644
index e6eaf529..0000000
--- a/chrome/app/theme/infobarbutton_br_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_c_h.png b/chrome/app/theme/infobarbutton_c_h.png
deleted file mode 100644
index f43ea7f..0000000
--- a/chrome/app/theme/infobarbutton_c_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_c_n.png b/chrome/app/theme/infobarbutton_c_n.png
deleted file mode 100644
index 17b9b6d..0000000
--- a/chrome/app/theme/infobarbutton_c_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_c_p.png b/chrome/app/theme/infobarbutton_c_p.png
deleted file mode 100644
index 7e1a1fcf..0000000
--- a/chrome/app/theme/infobarbutton_c_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_l_h.png b/chrome/app/theme/infobarbutton_l_h.png
deleted file mode 100644
index b41b437..0000000
--- a/chrome/app/theme/infobarbutton_l_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_l_n.png b/chrome/app/theme/infobarbutton_l_n.png
deleted file mode 100644
index 9209c58..0000000
--- a/chrome/app/theme/infobarbutton_l_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_l_p.png b/chrome/app/theme/infobarbutton_l_p.png
deleted file mode 100644
index efbd771..0000000
--- a/chrome/app/theme/infobarbutton_l_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_menu_droparrow.png b/chrome/app/theme/infobarbutton_menu_droparrow.png
deleted file mode 100644
index c9b183a..0000000
--- a/chrome/app/theme/infobarbutton_menu_droparrow.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_r_h.png b/chrome/app/theme/infobarbutton_r_h.png
deleted file mode 100644
index 85634d7..0000000
--- a/chrome/app/theme/infobarbutton_r_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_r_n.png b/chrome/app/theme/infobarbutton_r_n.png
deleted file mode 100644
index 03d6e18..0000000
--- a/chrome/app/theme/infobarbutton_r_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_r_p.png b/chrome/app/theme/infobarbutton_r_p.png
deleted file mode 100644
index 75b7e56..0000000
--- a/chrome/app/theme/infobarbutton_r_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_t_h.png b/chrome/app/theme/infobarbutton_t_h.png
deleted file mode 100644
index 1016c6d..0000000
--- a/chrome/app/theme/infobarbutton_t_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_t_n.png b/chrome/app/theme/infobarbutton_t_n.png
deleted file mode 100644
index 268186b..0000000
--- a/chrome/app/theme/infobarbutton_t_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_t_p.png b/chrome/app/theme/infobarbutton_t_p.png
deleted file mode 100644
index bc91279..0000000
--- a/chrome/app/theme/infobarbutton_t_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tl_h.png b/chrome/app/theme/infobarbutton_tl_h.png
deleted file mode 100644
index 587b10c..0000000
--- a/chrome/app/theme/infobarbutton_tl_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tl_n.png b/chrome/app/theme/infobarbutton_tl_n.png
deleted file mode 100644
index 1a65a95..0000000
--- a/chrome/app/theme/infobarbutton_tl_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tl_p.png b/chrome/app/theme/infobarbutton_tl_p.png
deleted file mode 100644
index 374f3a0..0000000
--- a/chrome/app/theme/infobarbutton_tl_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tr_h.png b/chrome/app/theme/infobarbutton_tr_h.png
deleted file mode 100644
index b6d88ed..0000000
--- a/chrome/app/theme/infobarbutton_tr_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tr_n.png b/chrome/app/theme/infobarbutton_tr_n.png
deleted file mode 100644
index 08598d3..0000000
--- a/chrome/app/theme/infobarbutton_tr_n.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/infobarbutton_tr_p.png b/chrome/app/theme/infobarbutton_tr_p.png
deleted file mode 100644
index d4d6278..0000000
--- a/chrome/app/theme/infobarbutton_tr_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/input_alert.png b/chrome/app/theme/input_alert.png
deleted file mode 100644
index 503a545..0000000
--- a/chrome/app/theme/input_alert.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 0cc038e..f8ee778 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -198,7 +198,6 @@
<include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.png" type="BINDATA" />
</if>
<include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
- <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_C" file="locationbg_c.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_L" file="locationbg_l.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" />
@@ -430,38 +429,6 @@
<include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
</if>
- <!-- Images only used by the Views toolkit. -->
- <if expr="pp_ifdef('toolkit_views')">
- <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_H" file="infobarbutton_bl_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_N" file="infobarbutton_bl_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_P" file="infobarbutton_bl_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_H" file="infobarbutton_b_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_N" file="infobarbutton_b_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_P" file="infobarbutton_b_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_H" file="infobarbutton_br_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_N" file="infobarbutton_br_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_P" file="infobarbutton_br_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_CENTER_H" file="infobarbutton_c_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_CENTER_N" file="infobarbutton_c_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_CENTER_P" file="infobarbutton_c_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_LEFT_H" file="infobarbutton_l_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_LEFT_N" file="infobarbutton_l_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_RIGHT_H" file="infobarbutton_r_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_RIGHT_N" file="infobarbutton_r_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_RIGHT_P" file="infobarbutton_r_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_H" file="infobarbutton_t_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_LEFT_H" file="infobarbutton_tl_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_LEFT_P" file="infobarbutton_tl_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_P" file="infobarbutton_t_p.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_RIGHT_H" file="infobarbutton_tr_h.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_RIGHT_N" file="infobarbutton_tr_n.png" type="BINDATA" />
- <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" />
- </if>
-
<if expr="pp_ifdef('chromeos')">
<include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" />
</if>
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
index b0feb24..941eab9 100644
--- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm
+++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
@@ -21,7 +21,6 @@
#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
#include "grit/app_resources.h"
-#include "grit/theme_resources.h"
// Delegate protocol that needs to be in place for the AutoFillTableView's
// handling of delete and backspace keys.
diff --git a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
index dcb97ed..7bd5219 100644
--- a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
+++ b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,7 +11,6 @@
#include "chrome/browser/search_engines/template_url_model.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
namespace {
diff --git a/chrome/browser/gtk/options/content_exception_editor.cc b/chrome/browser/gtk/options/content_exception_editor.cc
index 10b786a..002dfb3 100644
--- a/chrome/browser/gtk/options/content_exception_editor.cc
+++ b/chrome/browser/gtk/options/content_exception_editor.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/host_content_settings_map.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
ContentExceptionEditor::ContentExceptionEditor(
GtkWindow* parent,
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 7900250..fcc732ce 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -28,7 +28,6 @@
#include "grit/generated_resources.h"
#include "grit/theme_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 7a0ad9d..c52a2bb 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/theme_resources.h"
+#include "grit/app_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 1527c0b..e80910b 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/theme_resources.h"
+#include "grit/app_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 88e396b..2bb8287 100644
--- a/chrome/browser/views/options/exception_editor_view.cc
+++ b/chrome/browser/views/options/exception_editor_view.cc
@@ -12,7 +12,6 @@
#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"