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

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

Issue 1566563002: Vectorize CrOS window control icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dummy GetIcon impl in TestToolbarModel 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
Index: chrome/browser/ui/views/frame/browser_header_painter_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index 4982ef5dc80c99d5db7dc9afc8055ccb0fae163f..336821c07363afed731a4b26ffde47646acba6ac 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -25,6 +25,7 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skia_util.h"
+#include "ui/gfx/vector_icons_public.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -403,22 +404,21 @@ gfx::ImageSkia BrowserHeaderPainterAsh::GetFrameImageForNonTabbedBrowser(
void BrowserHeaderPainterAsh::UpdateCaptionButtons() {
caption_button_container_->SetButtonImage(
ash::CAPTION_BUTTON_ICON_MINIMIZE,
- IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE);
+ gfx::VectorIconId::WINDOW_CONTROL_MINIMIZE);
caption_button_container_->SetButtonImage(
- ash::CAPTION_BUTTON_ICON_CLOSE,
- IDR_AURA_WINDOW_CONTROL_ICON_CLOSE);
+ ash::CAPTION_BUTTON_ICON_CLOSE, gfx::VectorIconId::WINDOW_CONTROL_CLOSE);
caption_button_container_->SetButtonImage(
ash::CAPTION_BUTTON_ICON_LEFT_SNAPPED,
- IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED);
+ gfx::VectorIconId::WINDOW_CONTROL_LEFT_SNAPPED);
caption_button_container_->SetButtonImage(
ash::CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
- IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED);
+ gfx::VectorIconId::WINDOW_CONTROL_RIGHT_SNAPPED);
- int size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE;
+ gfx::VectorIconId size_icon_id = gfx::VectorIconId::WINDOW_CONTROL_MAXIMIZE;
gfx::Size button_size(
GetAshLayoutSize(AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON));
if (frame_->IsMaximized() || frame_->IsFullscreen()) {
- size_icon_id = IDR_AURA_WINDOW_CONTROL_ICON_RESTORE;
+ size_icon_id = gfx::VectorIconId::WINDOW_CONTROL_RESTORE;
button_size =
GetAshLayoutSize(AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON);
}
« no previous file with comments | « chrome/browser/ui/toolbar/test_toolbar_model.cc ('k') | chrome/browser/ui/views/frame/web_app_left_header_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698