diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 10:06:55 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 10:06:55 +0000 |
| commit | c91f8cfd89d4cd14f65ea2ab6add9004e532524d (patch) | |
| tree | 1168f4b2996638b5a4a4015d644c44f1cfc96c8e | |
| parent | ad94d4e64193ffbe5b3489ccca8554b6dc05f6fb (diff) | |
| download | chromium_src-c91f8cfd89d4cd14f65ea2ab6add9004e532524d.zip chromium_src-c91f8cfd89d4cd14f65ea2ab6add9004e532524d.tar.gz chromium_src-c91f8cfd89d4cd14f65ea2ab6add9004e532524d.tar.bz2 | |
Moving the Chromium image into the appropriate folder. Also hooking up the Chrome image, which has already been checked in.
BUG=80694
TEST=Go to any chrome:// page and click the Page Info icon. You should see a Chrome logo for Google Chrome and a Chromium one for Chromium.
Review URL: http://codereview.chromium.org/7191018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90014 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/pageinfo_internal.png | bin | 4180 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/page_info_model.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/chrome/app/theme/pageinfo_internal.png b/chrome/app/theme/pageinfo_internal.png Binary files differdeleted file mode 100644 index c429a18..0000000 --- a/chrome/app/theme/pageinfo_internal.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 09d1c19..1fecfb3 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -192,7 +192,6 @@ <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" /> <include name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" type="BINDATA" /> <include name="IDR_PAGEINFO_INFO" file="pageinfo_info.png" type="BINDATA" /> - <include name="IDR_PAGEINFO_INTERNAL" file="pageinfo_internal.png" type="BINDATA" /> <include name="IDR_PAGEINFO_WARNING_MAJOR" file="pageinfo_warning_major.png" type="BINDATA" /> <include name="IDR_PAGEINFO_WARNING_MINOR" file="pageinfo_warning_minor.png" type="BINDATA" /> <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> @@ -203,6 +202,7 @@ <include name="IDR_PRODUCT_ICON_32" file="google_chrome/google_chrome_icon_32.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_26" file="google_chrome/product_logo_26.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" type="BINDATA" /> </if> @@ -211,6 +211,7 @@ <include name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_26" file="chromium/product_logo_26.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" /> </if> <!-- NOTE: product_logo_*.* files beyond what's listed above are diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index 57d974b..fe72383 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -355,5 +355,5 @@ void PageInfoModel::Init() { icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MAJOR)); icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_BAD)); icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_INFO)); - icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_INTERNAL)); + icons_.push_back(&rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_26)); } |
