diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 01:21:52 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 01:21:52 +0000 |
| commit | d3699727ed22ae21c597cd36f1445a19febe7353 (patch) | |
| tree | 6f28f6c8a8d7c650bd2275147deabd4242d11fce /chrome | |
| parent | f4d62d69d1024bb613273a87507e2ed1a6c8fa46 (diff) | |
| download | chromium_src-d3699727ed22ae21c597cd36f1445a19febe7353.zip chromium_src-d3699727ed22ae21c597cd36f1445a19febe7353.tar.gz chromium_src-d3699727ed22ae21c597cd36f1445a19febe7353.tar.bz2 | |
fix a couple of close buttons
the gtk extension installed button doesn't need to be themed because the background is always white (and is not the tab color, like it is in most other places in the UI)
the list item x isn't changing (the images are the same), only the URL is changing. I think this is the 'x' we want, because it's what we use on the NTP.
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/5880003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/extension_installed_bubble_gtk.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/options/options_page.css | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc index 8c45e40..e844f56 100644 --- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc @@ -242,11 +242,6 @@ void ExtensionInstalledBubbleGtk::ShowInternal() { close_button_.reset(CustomDrawButton::CloseButton(theme_provider)); g_signal_connect(close_button_->widget(), "clicked", G_CALLBACK(OnButtonClick), this); - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - close_button_->SetBackground( - theme_provider->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT), - rb.GetBitmapNamed(IDR_CLOSE_BAR), - rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK)); gtk_box_pack_start(GTK_BOX(close_column), close_button_->widget(), FALSE, FALSE, 0); diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index 6d97853..315217f 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -40,8 +40,7 @@ body { .close-subpage { background-color: transparent; - /* TODO(stuartmorgan): Replace with real images once they are available. */ - background-image: url("../../../app/theme/close_bar.png"); + background-image: url('chrome://theme/IDR_CLOSE_BAR'); border: none; position: relative; top: 12px; @@ -50,11 +49,11 @@ body { } .close-subpage:hover { - background-image: url("../../../app/theme/close_bar_h.png"); + background-image: url('chrome://theme/IDR_CLOSE_BAR_H'); } .close-subpage:active { - background-image: url("../../../app/theme/close_bar_p.png"); + background-image: url('chrome://theme/IDR_CLOSE_BAR_P'); } html[dir='ltr'] .close-subpage { |