summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:45:16 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 22:45:16 +0000
commit48f4490d6f1fac802205fab08fcf2211a8596822 (patch)
tree872050e3eeb34c25911a92fb0109502935fb7187
parent88c27afd0b1bff243e2a73ee4f81090ee1896754 (diff)
downloadchromium_src-48f4490d6f1fac802205fab08fcf2211a8596822.zip
chromium_src-48f4490d6f1fac802205fab08fcf2211a8596822.tar.gz
chromium_src-48f4490d6f1fac802205fab08fcf2211a8596822.tar.bz2
Remove a bunch of images that don't seem to be used.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2722003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49203 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/theme/back_noborder.pngbin555 -> 0 bytes
-rw-r--r--chrome/app/theme/forward_noborder.pngbin548 -> 0 bytes
-rw-r--r--chrome/app/theme/go_noborder.pngbin418 -> 0 bytes
-rw-r--r--chrome/app/theme/home_noborder.pngbin550 -> 0 bytes
-rw-r--r--chrome/app/theme/reload_noborder.pngbin742 -> 0 bytes
-rw-r--r--chrome/app/theme/reload_noborder_center.pngbin746 -> 0 bytes
-rw-r--r--chrome/app/theme/stop_noborder.pngbin563 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd7
-rw-r--r--chrome/browser/browser_theme_pack.cc52
-rw-r--r--chrome/browser/browser_theme_provider.cc11
-rw-r--r--chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pakbin1220575 -> 1194298 bytes
11 files changed, 29 insertions, 41 deletions
diff --git a/chrome/app/theme/back_noborder.png b/chrome/app/theme/back_noborder.png
deleted file mode 100644
index 8e59fad..0000000
--- a/chrome/app/theme/back_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/forward_noborder.png b/chrome/app/theme/forward_noborder.png
deleted file mode 100644
index 17559b5..0000000
--- a/chrome/app/theme/forward_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/go_noborder.png b/chrome/app/theme/go_noborder.png
deleted file mode 100644
index 1180e8b..0000000
--- a/chrome/app/theme/go_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/home_noborder.png b/chrome/app/theme/home_noborder.png
deleted file mode 100644
index 6c463a2..0000000
--- a/chrome/app/theme/home_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/reload_noborder.png b/chrome/app/theme/reload_noborder.png
deleted file mode 100644
index d9adf19..0000000
--- a/chrome/app/theme/reload_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/reload_noborder_center.png b/chrome/app/theme/reload_noborder_center.png
deleted file mode 100644
index d0d7a9b..0000000
--- a/chrome/app/theme/reload_noborder_center.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/stop_noborder.png b/chrome/app/theme/stop_noborder.png
deleted file mode 100644
index 012e254..0000000
--- a/chrome/app/theme/stop_noborder.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 0e7fdfc..de2ffb7 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -12,7 +12,6 @@
<release seq="1">
<includes>
<include name="IDR_BACK" file="back.png" type="BINDATA" />
- <include name="IDR_BACK_NOBORDER" file="back_noborder.png" type="BINDATA" />
<include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
<include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
<include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
@@ -30,12 +29,10 @@
<include name="IDR_DROP_H" file="drop_h.png" type="BINDATA" />
<include name="IDR_DROP_P" file="drop_p.png" type="BINDATA" />
<include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
- <include name="IDR_FORWARD_NOBORDER" file="forward_noborder.png" type="BINDATA" />
<include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
<include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
<include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
<include name="IDR_GO" file="go.png" type="BINDATA" />
- <include name="IDR_GO_NOBORDER" file="go_noborder.png" type="BINDATA" />
<include name="IDR_GO_NOBORDER_CENTER" file="go_noborder_center.png" type="BINDATA" />
<include name="IDR_GO_H" file="go_h.png" type="BINDATA" />
<include name="IDR_GO_P" file="go_p.png" type="BINDATA" />
@@ -72,8 +69,6 @@
<include name="IDR_OMNIBOX_STAR_SELECTED" file="omnibox_star_selected.png" type="BINDATA" />
<include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" />
<include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
- <include name="IDR_RELOAD_NOBORDER" file="reload_noborder.png" type="BINDATA" />
- <include name="IDR_RELOAD_NOBORDER_CENTER" file="reload_noborder_center.png" type="BINDATA" />
<include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
<include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
<include name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" type="BINDATA" />
@@ -149,7 +144,6 @@
<include name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" type="BINDATA" />
<include name="IDR_WARNING" file="alert_small.png" type="BINDATA" />
<include name="IDR_STOP" file="stop.png" type="BINDATA" />
- <include name="IDR_STOP_NOBORDER" file="stop_noborder.png" type="BINDATA" />
<include name="IDR_STOP_NOBORDER_CENTER" file="stop_noborder_center.png" type="BINDATA" />
<include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
<include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
@@ -264,7 +258,6 @@
<include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
<include name="IDR_HOME" file="home.png" type="BINDATA" />
- <include name="IDR_HOME_NOBORDER" file="home_noborder.png" type="BINDATA" />
<include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
<include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
<include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
index 3159bf7..31f2866 100644
--- a/chrome/browser/browser_theme_pack.cc
+++ b/chrome/browser/browser_theme_pack.cc
@@ -23,7 +23,7 @@ namespace {
// Version number of the current theme pack. We just throw out and rebuild
// theme packs that aren't int-equal to this.
-const int kThemePackVersion = 8;
+const int kThemePackVersion = 9;
// IDs that are in the DataPack won't clash with the positive integer
// int32_t. kHeaderID should always have the maximum value because we want the
@@ -120,33 +120,29 @@ PersistingImagesTable kPersistingImages[] = {
{ 21, IDR_FORWARD_H, NULL },
{ 22, IDR_FORWARD_P, NULL },
{ 23, IDR_RELOAD, NULL },
- { 24, IDR_RELOAD_NOBORDER, NULL },
- { 25, IDR_RELOAD_NOBORDER_CENTER, NULL },
- { 26, IDR_RELOAD_H, NULL },
- { 27, IDR_RELOAD_P, NULL },
- { 28, IDR_HOME, NULL },
- { 29, IDR_HOME_H, NULL },
- { 30, IDR_HOME_P, NULL },
- { 31, IDR_GO, NULL },
- { 32, IDR_GO_NOBORDER, NULL },
- { 33, IDR_GO_NOBORDER_CENTER, NULL },
- { 34, IDR_GO_H, NULL },
- { 35, IDR_GO_P, NULL },
- { 36, IDR_STOP, NULL },
- { 37, IDR_STOP_NOBORDER, NULL },
- { 38, IDR_STOP_NOBORDER_CENTER, NULL },
- { 39, IDR_STOP_H, NULL },
- { 40, IDR_STOP_P, NULL },
- { 41, IDR_MENU_BOOKMARK, NULL },
- { 42, IDR_MENU_PAGE, NULL },
- { 43, IDR_MENU_PAGE_RTL, NULL },
- { 44, IDR_MENU_CHROME, NULL },
- { 45, IDR_MENU_CHROME_RTL, NULL },
- { 46, IDR_MENU_DROPARROW, NULL },
- { 47, IDR_THROBBER, NULL },
- { 48, IDR_THROBBER_WAITING, NULL },
- { 49, IDR_THROBBER_LIGHT, NULL },
- { 50, IDR_LOCATIONBG, NULL }
+ { 24, IDR_RELOAD_H, NULL },
+ { 25, IDR_RELOAD_P, NULL },
+ { 26, IDR_HOME, NULL },
+ { 27, IDR_HOME_H, NULL },
+ { 28, IDR_HOME_P, NULL },
+ { 29, IDR_GO, NULL },
+ { 30, IDR_GO_NOBORDER_CENTER, NULL },
+ { 31, IDR_GO_H, NULL },
+ { 32, IDR_GO_P, NULL },
+ { 33, IDR_STOP, NULL },
+ { 34, IDR_STOP_NOBORDER_CENTER, NULL },
+ { 35, IDR_STOP_H, NULL },
+ { 36, IDR_STOP_P, NULL },
+ { 37, IDR_MENU_BOOKMARK, NULL },
+ { 38, IDR_MENU_PAGE, NULL },
+ { 39, IDR_MENU_PAGE_RTL, NULL },
+ { 40, IDR_MENU_CHROME, NULL },
+ { 41, IDR_MENU_CHROME_RTL, NULL },
+ { 42, IDR_MENU_DROPARROW, NULL },
+ { 43, IDR_THROBBER, NULL },
+ { 44, IDR_THROBBER_WAITING, NULL },
+ { 45, IDR_THROBBER_LIGHT, NULL },
+ { 46, IDR_LOCATIONBG, NULL }
};
int GetPersistentIDByName(const std::string& key) {
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 9c7912d..cea5568 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -136,17 +136,16 @@ bool HasThemeableImage(int themeable_image_id) {
// The image resources that will be tinted by the 'button' tint value.
// If you change this list, you must increment the version number in
-// browser_theme_pack.cc and you should assign persistant ids to the
-// data table at the start of said file or otherwise tinted versions of
+// browser_theme_pack.cc, and you should assign persistent IDs to the
+// data table at the start of said file or else tinted versions of
// these resources will not be created.
const int kToolbarButtonIDs[] = {
IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P,
IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P,
- IDR_RELOAD, IDR_RELOAD_NOBORDER, IDR_RELOAD_NOBORDER_CENTER, IDR_RELOAD_H,
- IDR_RELOAD_P,
+ IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
IDR_HOME, IDR_HOME_H, IDR_HOME_P,
- IDR_GO, IDR_GO_NOBORDER, IDR_GO_NOBORDER_CENTER, IDR_GO_H, IDR_GO_P,
- IDR_STOP, IDR_STOP_NOBORDER, IDR_STOP_NOBORDER_CENTER, IDR_STOP_H, IDR_STOP_P,
+ IDR_GO, IDR_GO_NOBORDER_CENTER, IDR_GO_H, IDR_GO_P,
+ IDR_STOP, IDR_STOP_NOBORDER_CENTER, IDR_STOP_H, IDR_STOP_P,
IDR_MENU_BOOKMARK,
IDR_MENU_PAGE, IDR_MENU_PAGE_RTL,
IDR_MENU_CHROME, IDR_MENU_CHROME_RTL,
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
index 14a9c6b..42bd2fd 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
+++ b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
Binary files differ