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

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: WIP for pkasting and estade feedback Created 5 years 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
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..159c59d5235cc46e215cce162a2c13212fa236d6 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
@@ -9,6 +9,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ssl/chrome_security_state_model_client.h"
#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "components/toolbar/toolbar_model.h"
#include "content/public/browser/navigation_entry.h"
@@ -25,10 +26,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 +43,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)

Powered by Google App Engine
This is Rietveld 408576698