diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 21:27:29 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 21:27:29 +0000 |
| commit | 6c8dcc3cb5d7f6b0523fd44b6a72aa42b911a575 (patch) | |
| tree | 75d5590c946b5fb22f240fa1e7c5510be522fd87 /chrome | |
| parent | 01c675be13a4a6acf13c2e41d45aac9f66975c11 (diff) | |
| download | chromium_src-6c8dcc3cb5d7f6b0523fd44b6a72aa42b911a575.zip chromium_src-6c8dcc3cb5d7f6b0523fd44b6a72aa42b911a575.tar.gz chromium_src-6c8dcc3cb5d7f6b0523fd44b6a72aa42b911a575.tar.bz2 | |
Switch to the new extensions default icon.
BUG=27399
TEST=Extensions without an icon now have a light-blue
puzzle-piece icon when installing/uninstalling them
and when listing them on chrome://extensions.
Review URL: http://codereview.chromium.org/384055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/extension_default_icon.png | bin | 0 -> 3932 bytes |
4 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 3a5ce14..13ad192 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -45,6 +45,7 @@ without changes to the corresponding grd file. ek --> <include name="IDR_LOCAL_STRINGS_JS" file="resources\local_strings.js" type="BINDATA" /> <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> + <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_default_icon.png" type="BINDATA" /> <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensions_toolstrip.css" flattenhtml="true" type="BINDATA" /> <include name="IDR_PRINT_TAB_HTML" file="resources\print_tab.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_PRINT_TAB_CSS" file="resources\print_tab.css" type="BINDATA" /> diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 09a82c4..c89a9fa 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -130,7 +130,7 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate, if (!install_icon) { install_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_EXTENSIONS_SECTION); + IDR_EXTENSION_DEFAULT_ICON); } icon_ = *install_icon; @@ -150,7 +150,7 @@ void ExtensionInstallUI::ConfirmUninstall(Delegate* delegate, if (!icon) { icon = ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_EXTENSIONS_SECTION); + IDR_EXTENSION_DEFAULT_ICON); } std::wstring message = diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 867a7e8..70c9fa1 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -164,7 +164,7 @@ void ExtensionsDOMHandler::IconLoader::LoadIconsOnFileThread( // If there's no icon, default to the puzzle icon. This is safe to do from // the file thread. file_contents = ResourceBundle::GetSharedInstance().GetDataResource( - IDR_INFOBAR_PLUGIN_INSTALL); + IDR_EXTENSION_DEFAULT_ICON); } // If the extension is disabled, we desaturate the icon to add to the diff --git a/chrome/browser/resources/extension_default_icon.png b/chrome/browser/resources/extension_default_icon.png Binary files differnew file mode 100644 index 0000000..31aaf05 --- /dev/null +++ b/chrome/browser/resources/extension_default_icon.png |
