Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4054)

Unified Diff: chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc

Issue 1505223004: Do not use assets for Ash window control button backgrounds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for landing Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc
index 4b145e7843f8768ceca70729b637fc772ee0fe27..10bdd7ae33145104dd1ae42938ca307201391bd0 100644
--- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc
+++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc
@@ -25,10 +25,9 @@ WebAppLeftHeaderView::WebAppLeftHeaderView(BrowserView* browser_view)
back_button_ =
new ash::FrameCaptionButton(this, ash::CAPTION_BUTTON_ICON_BACK);
- back_button_->SetImages(
- ash::CAPTION_BUTTON_ICON_BACK, ash::FrameCaptionButton::ANIMATE_NO,
- IDR_AURA_WINDOW_CONTROL_ICON_BACK, IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
- IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+ back_button_->SetImage(ash::CAPTION_BUTTON_ICON_BACK,
+ ash::FrameCaptionButton::ANIMATE_NO,
+ IDR_AURA_WINDOW_CONTROL_ICON_BACK);
AddChildView(back_button_);
location_icon_ =
@@ -43,10 +42,9 @@ WebAppLeftHeaderView::~WebAppLeftHeaderView() {
void WebAppLeftHeaderView::Update() {
int icon_resource = browser_view_->browser()->toolbar_model()->GetIcon();
- location_icon_->SetImages(ash::CAPTION_BUTTON_ICON_LOCATION,
- ash::FrameCaptionButton::ANIMATE_NO, icon_resource,
- IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
- IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+ location_icon_->SetImage(ash::CAPTION_BUTTON_ICON_LOCATION,
+ ash::FrameCaptionButton::ANIMATE_NO,
+ icon_resource);
back_button_->SetState(
chrome::IsCommandEnabled(browser_view_->browser(), IDC_BACK)
« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698