diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 19:00:45 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 19:00:45 +0000 |
| commit | 9548e6c0cdea562a1b5293b224fb1e10ff6fcfb2 (patch) | |
| tree | 4c5f11bab2a320580354022d15c9765df465ebab | |
| parent | 63d7e18bb3a04a27f44780ed10b8286ddcd41bdf (diff) | |
| download | chromium_src-9548e6c0cdea562a1b5293b224fb1e10ff6fcfb2.zip chromium_src-9548e6c0cdea562a1b5293b224fb1e10ff6fcfb2.tar.gz chromium_src-9548e6c0cdea562a1b5293b224fb1e10ff6fcfb2.tar.bz2 | |
Random image updates from Nicholas. I'll nuke the one in google_chrome
separately.
BUG=none
TEST=none
TBR=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/1629007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43860 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/app/theme/app_launcher_button.png | bin | 0 -> 238 bytes | |||
| -rw-r--r-- | chrome/app/theme/chromium/app_launcher_button.png | bin | 588 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_frame_default2.png | bin | 4998 -> 3008 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_frame_default_incognito2.png | bin | 3564 -> 2978 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 9 | ||||
| -rw-r--r-- | chrome/app/theme/theme_toolbar_default2.png | bin | 7290 -> 4684 bytes |
6 files changed, 1 insertions, 8 deletions
diff --git a/chrome/app/theme/app_launcher_button.png b/chrome/app/theme/app_launcher_button.png Binary files differnew file mode 100755 index 0000000..7dba348 --- /dev/null +++ b/chrome/app/theme/app_launcher_button.png diff --git a/chrome/app/theme/chromium/app_launcher_button.png b/chrome/app/theme/chromium/app_launcher_button.png Binary files differdeleted file mode 100644 index e3e0ce4..0000000 --- a/chrome/app/theme/chromium/app_launcher_button.png +++ /dev/null diff --git a/chrome/app/theme/theme_frame_default2.png b/chrome/app/theme/theme_frame_default2.png Binary files differindex e70ed56..1465088 100644 --- a/chrome/app/theme/theme_frame_default2.png +++ b/chrome/app/theme/theme_frame_default2.png diff --git a/chrome/app/theme/theme_frame_default_incognito2.png b/chrome/app/theme/theme_frame_default_incognito2.png Binary files differindex b9cdd7b..65dad53 100644 --- a/chrome/app/theme/theme_frame_default_incognito2.png +++ b/chrome/app/theme/theme_frame_default_incognito2.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index db6ff7c..8c9d7f8 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -463,16 +463,9 @@ <include name="IDR_MEDIAPLAYER_FULL_SCREEN" file="mediaplayer_full_screen.png" type="BINDATA" /> <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" /> <include name="IDR_LOGIN_OTHER_USER" file="login_other.png" type="BINDATA" /> + <include name="IDR_APP_LAUNCHER_BUTTON" file="app_launcher_button.png" type="BINDATA" /> </if> - <if expr="(pp_ifdef('chromeos') or pp_ifdef('toolkit_views')) and pp_ifdef('_google_chrome')"> - <include name="IDR_APP_LAUNCHER_BUTTON" file="google_chrome/app_launcher_button.png" type="BINDATA" /> - </if> - - <if expr="(pp_ifdef('chromeos') or pp_ifdef('toolkit_views')) and not pp_ifdef('_google_chrome')"> - <include name="IDR_APP_LAUNCHER_BUTTON" file="chromium/app_launcher_button.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')"> <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" /> <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" /> diff --git a/chrome/app/theme/theme_toolbar_default2.png b/chrome/app/theme/theme_toolbar_default2.png Binary files differindex e04555d..c6c8f86 100644 --- a/chrome/app/theme/theme_toolbar_default2.png +++ b/chrome/app/theme/theme_toolbar_default2.png |
