diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 00:24:05 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 00:24:05 +0000 |
| commit | db471b330fc82a9f450807ec1f4307c29dda23c4 (patch) | |
| tree | 06989a0a83a69daac4032ed3cf00f1e53040a151 | |
| parent | 28004d12a4719aead0b7f87bc483347297f1ed2e (diff) | |
| download | chromium_src-db471b330fc82a9f450807ec1f4307c29dda23c4.zip chromium_src-db471b330fc82a9f450807ec1f4307c29dda23c4.tar.gz chromium_src-db471b330fc82a9f450807ec1f4307c29dda23c4.tar.bz2 | |
Add a default icon for theme install infobar.
BUG=18227
TEST=Install a theme, verify that an infobar with a pretty icon appears.
Review URL: http://codereview.chromium.org/165205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23126 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/infobar_theme.png | bin | 0 -> 1900 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/theme_preview_infobar_delegate.cc | 5 |
3 files changed, 5 insertions, 1 deletions
diff --git a/chrome/app/theme/infobar_theme.png b/chrome/app/theme/infobar_theme.png Binary files differnew file mode 100644 index 0000000..fefdd41 --- /dev/null +++ b/chrome/app/theme/infobar_theme.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index a0034c3..c9aab8e 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -225,6 +225,7 @@ <include name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" type="BINDATA" /> <include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" /> <include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" /> + <include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" /> <include name="IDR_INFO_BUBBLE_CORNER_TOP_LEFT" file="bubble_corner_tl.png" type="BINDATA" /> <include name="IDR_INFO_BUBBLE_CORNER_TOP_RIGHT" file="bubble_corner_tr.png" type="BINDATA" /> <include name="IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT" file="bubble_corner_bl.png" type="BINDATA" /> diff --git a/chrome/browser/extensions/theme_preview_infobar_delegate.cc b/chrome/browser/extensions/theme_preview_infobar_delegate.cc index ac71aa9..7dddb11 100644 --- a/chrome/browser/extensions/theme_preview_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_preview_infobar_delegate.cc @@ -5,12 +5,14 @@ #include "chrome/browser/extensions/theme_preview_infobar_delegate.h" #include "app/l10n_util.h" +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" +#include "grit/theme_resources.h" ThemePreviewInfobarDelegate::ThemePreviewInfobarDelegate( TabContents* tab_contents, const std::string& name, @@ -32,7 +34,8 @@ std::wstring ThemePreviewInfobarDelegate::GetMessageText() const { SkBitmap* ThemePreviewInfobarDelegate::GetIcon() const { // TODO(aa): Reply with the theme's icon, but this requires reading it // asynchronously from disk. - return NULL; + return ResourceBundle::GetSharedInstance().GetBitmapNamed( + IDR_INFOBAR_THEME); } ThemePreviewInfobarDelegate* |
