diff options
9 files changed, 39 insertions, 29 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index dc66b87..e68d5cb 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -845,6 +845,9 @@ <structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small.png" /> <structure type="chrome_scaled_image" name="IDR_WEB_INTENT_PROGRESS_BACKGROUND" file="common/web_intent_progress_background.png" /> <structure type="chrome_scaled_image" name="IDR_WEB_INTENT_PROGRESS_FOREGROUND" file="common/web_intent_progress_foreground.png" /> + <structure type="chrome_scaled_image" name="IDR_WEB_UI_CLOSE" file="web_ui_close.png" /> + <structure type="chrome_scaled_image" name="IDR_WEB_UI_CLOSE_HOVER" file="web_ui_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_WEB_UI_CLOSE_PRESSED" file="web_ui_close_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_CENTER" file="website_settings_tabstrip_center.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_LEFT" file="website_settings_tabstrip_left.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_RIGHT" file="website_settings_tabstrip_right.png" /> diff --git a/chrome/browser/resources/print_preview/no_destinations_promo.css b/chrome/browser/resources/print_preview/no_destinations_promo.css index fb9305c..ea0727a 100644 --- a/chrome/browser/resources/print_preview/no_destinations_promo.css +++ b/chrome/browser/resources/print_preview/no_destinations_promo.css @@ -37,7 +37,7 @@ } #no-destinations-promo .close-button { - background-image: url(chrome://resources/images/x.png); + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE'); background-position: center; background-repeat: no-repeat; height: 16px; @@ -47,7 +47,11 @@ } #no-destinations-promo .close-button:hover { - background-image: url(chrome://resources/images/x-hover.png); + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_HOVER'); +} + +#no-destinations-promo .close-button:active { + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_PRESSED'); } #no-destinations-promo .action-button-container { diff --git a/chrome/browser/resources/print_preview/search/destination_search.css b/chrome/browser/resources/print_preview/search/destination_search.css index 14980cc..cc572a8 100644 --- a/chrome/browser/resources/print_preview/search/destination_search.css +++ b/chrome/browser/resources/print_preview/search/destination_search.css @@ -77,12 +77,17 @@ #destination-search .cloudprint-promo .close-button { -webkit-margin-start: 12px; - background-image: url(chrome://resources/images/x.png); - background-position: -2px -1px; - height: 18px; - width: 18px; + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE'); + background-repeat: no-repeat; + background-size: 14px; + height: 14px; + width: 14px; } #destination-search .cloudprint-promo .close-button:hover { - background-image: url(chrome://resources/images/x-hover.png); -}
\ No newline at end of file + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_HOVER'); +} + +#destination-search .cloudprint-promo .close-button:active { + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_PRESSED'); +} diff --git a/chrome/browser/resources/shared/css/dialogs.css b/chrome/browser/resources/shared/css/dialogs.css index 1f1ee07..35d2e7b 100644 --- a/chrome/browser/resources/shared/css/dialogs.css +++ b/chrome/browser/resources/shared/css/dialogs.css @@ -129,7 +129,7 @@ } .cr-dialog-close { - background: url('../images/x.png') center no-repeat; + background: url('chrome://theme/IDR_WEB_UI_CLOSE') center no-repeat; display: inline-block; height: 44px; opacity: 0.7; @@ -139,8 +139,10 @@ width: 44px; } -.cr-dialog-close:hover, -.cr-dialog-close:active { - background-image: url('../images/x-hover.png'); +.cr-dialog-close:hover { + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_HOVER'); } +.cr-dialog-close:active { + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_PRESSED'); +} diff --git a/chrome/browser/resources/shared/css/overlay.css b/chrome/browser/resources/shared/css/overlay.css index f70d6dc..d7d112f 100644 --- a/chrome/browser/resources/shared/css/overlay.css +++ b/chrome/browser/resources/shared/css/overlay.css @@ -70,7 +70,7 @@ } .overlay .page > .close-button { - background-image: url('../images/x.png'); + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE'); background-position: center; background-repeat: no-repeat; height: 14px; @@ -86,11 +86,11 @@ html[dir='rtl'] .overlay .page > .close-button { } .overlay .page > .close-button:hover { - background-image: url('../images/x-hover.png'); + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_HOVER'); } .overlay .page > .close-button:active { - background-image: url('../images/x-pressed.png'); + background-image: url('chrome://theme/IDR_WEB_UI_CLOSE_PRESSED'); } .overlay .page h1 { diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd index 91a3cd5..41777c9 100644 --- a/chrome/browser/resources/shared_resources.grd +++ b/chrome/browser/resources/shared_resources.grd @@ -31,12 +31,6 @@ without changes to the corresponding grd file. --> file="shared/images/throbber.svg" type="BINDATA" /> <include name="IDR_SHARED_IMAGES_TRASH" file="shared/images/trash.png" type="BINDATA" /> - <include name="IDR_SHARED_IMAGES_X" - file="shared/images/x.png" type="BINDATA" /> - <include name="IDR_SHARED_IMAGES_X_HOVER" - file="shared/images/x-hover.png" type="BINDATA" /> - <include name="IDR_SHARED_IMAGES_X_PRESSED" - file="shared/images/x-pressed.png" type="BINDATA" /> <include name="IDR_SHARED_IMAGES_CLOUDS" file="shared/images/clouds.png" type="BINDATA" /> </includes> diff --git a/chrome/browser/ui/views/constrained_window_frame_simple.cc b/chrome/browser/ui/views/constrained_window_frame_simple.cc index 9d2304a..0daa2f05 100644 --- a/chrome/browser/ui/views/constrained_window_frame_simple.cc +++ b/chrome/browser/ui/views/constrained_window_frame_simple.cc @@ -10,7 +10,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" -#include "grit/shared_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "ui/base/hit_test.h" @@ -72,11 +71,11 @@ ConstrainedWindowFrameSimple::ConstrainedWindowFrameSimple( close_button_ = new views::ImageButton(this); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE)); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_HOVER)); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_PRESSED)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_PRESSED)); close_button_->set_border(views::Border::CreateEmptyBorder( ConstrainedWindowConstants::kCloseButtonPadding - kHeaderTopPadding, 0, 0, 0)); diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc index 728c73f..5d82d7f 100644 --- a/chrome/browser/ui/views/web_intent_picker_views.cc +++ b/chrome/browser/ui/views/web_intent_picker_views.cc @@ -31,7 +31,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" -#include "grit/shared_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "ipc/ipc_message.h" @@ -106,11 +105,11 @@ views::ImageButton* CreateCloseButton(views::ButtonListener* listener) { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); views::ImageButton* close_button = new views::ImageButton(listener); close_button->SetImage(views::CustomButton::BS_NORMAL, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE)); close_button->SetImage(views::CustomButton::BS_HOT, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_HOVER)); close_button->SetImage(views::CustomButton::BS_PUSHED, - rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER)); + rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_PRESSED)); return close_button; } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index 25c01c2..8a10ece 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -22,6 +22,7 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/print_preview/print_preview_data_source.h" #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h" +#include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/print_messages.h" #include "content/public/browser/web_contents.h" #include "printing/page_size_margins.h" @@ -99,6 +100,9 @@ PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui) Profile* profile = Profile::FromWebUI(web_ui); ChromeURLDataManager::AddDataSource(profile, new PrintPreviewDataSource()); + // Set up the chrome://theme/ source. + ChromeURLDataManager::AddDataSource(profile, new ThemeSource(profile)); + // WebUI owns |handler_|. handler_ = new PrintPreviewHandler(); web_ui->AddMessageHandler(handler_); |