Commit 43697bea authored by finnur@chromium.org's avatar finnur@chromium.org

Standardize on the plugin icon (puzzle piece) as the default icon for

install dialogs and the management ui page.

Also changed the margins on the body to match the download page and
the history page so it doesn't look as bad when you switch between them.

TEST=Install an extension without an icon and you should see the puzzle
piece icon in the install dialog.
TEST=Open the chrome://extensions page and you should see the same icon
in the top left corner.
BUG=25906

Review URL: http://codereview.chromium.org/344014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30384 0039d316-1c4b-4281-b951-d872f2087c98
parent fae20799
...@@ -245,6 +245,7 @@ ...@@ -245,6 +245,7 @@
<include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="locationbg_readonly_edge.png" type="BINDATA" /> <include name="IDR_LOCATIONBG_POPUPMODE_EDGE" file="locationbg_readonly_edge.png" type="BINDATA" />
<include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDATA" /> <include name="IDR_HISTORY_SECTION" file="history_section.png" type="BINDATA" />
<include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" /> <include name="IDR_DOWNLOADS_SECTION" file="downloads_section.png" type="BINDATA" />
<include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" />
<include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" /> <include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" />
<include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" /> <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
<include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" /> <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" />
......
...@@ -54,7 +54,6 @@ without changes to the corresponding grd file. ek --> ...@@ -54,7 +54,6 @@ without changes to the corresponding grd file. ek -->
<include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_block.png" type="BINDATA" /> <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_block.png" type="BINDATA" />
<include name="IDR_DEFAULT_EXTENSION_ICON_128" file="resources\default_extension_icon_128.png" type="BINDATA" />
<include name="IDR_NOTIFICATION_HTML" file="resources\notification.html" type="BINDATA" /> <include name="IDR_NOTIFICATION_HTML" file="resources\notification.html" type="BINDATA" />
</includes> </includes>
</release> </release>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "grit/browser_resources.h" #include "grit/browser_resources.h"
#include "grit/chromium_strings.h" #include "grit/chromium_strings.h"
#include "grit/generated_resources.h" #include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#if defined(TOOLKIT_GTK) #if defined(TOOLKIT_GTK)
#include "chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h" #include "chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h"
...@@ -109,7 +110,7 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate, ...@@ -109,7 +110,7 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate,
if (!install_icon) { if (!install_icon) {
install_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed( install_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
IDR_DEFAULT_EXTENSION_ICON_128); IDR_EXTENSIONS_SECTION);
} }
ShowExtensionInstallPrompt(profile_, delegate, extension, install_icon, ShowExtensionInstallPrompt(profile_, delegate, extension, install_icon,
......
...@@ -7,12 +7,8 @@ ...@@ -7,12 +7,8 @@
body { body {
font-size: 87%; font-size: 87%;
font-family: Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
margin: 0; margin: 10px;
min-width: 47em; min-width: 47em;
padding-bottom: 0.75em;
padding-left: 1.5em;
padding-right: 2em;
padding-top: 0.75em;
} }
a { a {
...@@ -29,12 +25,12 @@ div#header { ...@@ -29,12 +25,12 @@ div#header {
position: relative; position: relative;
} }
div#header h1 { div#header h1 {
background: url('extensions_ui_page_logo.png') 0px 60% no-repeat; background: url('../../app/theme/extensions_section.png') 0px 20px no-repeat;
display: inline; display: inline;
margin: 0; margin: 0;
padding-bottom: 35px; padding-bottom: 43px;
padding-left: 75px; padding-left: 75px;
padding-top: 35px; padding-top: 40px;
} }
h1 { h1 {
......
...@@ -36,8 +36,12 @@ class InstallDialogContent : public views::View, public views::DialogDelegate { ...@@ -36,8 +36,12 @@ class InstallDialogContent : public views::View, public views::DialogDelegate {
InstallDialogContent(ExtensionInstallUI::Delegate* delegate, InstallDialogContent(ExtensionInstallUI::Delegate* delegate,
Extension* extension, SkBitmap* icon, const std::wstring& warning_text) Extension* extension, SkBitmap* icon, const std::wstring& warning_text)
: delegate_(delegate), icon_(NULL) { : delegate_(delegate), icon_(NULL) {
// Scale down to 85x85, but allow smaller icons (don't scale up).
gfx::Size size(icon->width(), icon->height());
if (size.width() > kIconSize || size.height() > kIconSize)
size = gfx::Size(kIconSize, kIconSize);
icon_ = new views::ImageView(); icon_ = new views::ImageView();
icon_->SetImageSize(gfx::Size(kIconSize, kIconSize)); icon_->SetImageSize(size);
icon_->SetImage(*icon); icon_->SetImage(*icon);
AddChildView(icon_); AddChildView(icon_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment