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

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

Issue 1452923002: Vectorize MD otr frame icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 91265cb61edb64d3b84c64df7a3f9997c55f96ad..3e4ff1a4e6818cb80633b9c25adce9bbf2ffae19 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -134,8 +134,10 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/screen.h"
+#include "ui/gfx/vector_icons_public.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/textfield/textfield.h"
@@ -682,6 +684,11 @@ WebContents* BrowserView::GetActiveWebContents() const {
}
gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
+ if (ui::MaterialDesignController::IsModeMaterial()) {
+ return gfx::CreateVectorIcon(gfx::VectorIconId::INCOGNITO, 24,
+ SK_ColorWHITE);
Peter Kasting 2015/11/17 21:07:58 Does this work on Win 10 where the frame color is
Evan Stade 2015/11/17 21:34:23 The mocks Sebastien provided show a black frame fo
Peter Kasting 2015/11/17 21:48:31 It's currently not technically possible to impleme
+ }
+
return *GetThemeProvider()->GetImageSkiaNamed(IDR_OTR_ICON);
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view.cc ('k') | chrome/browser/ui/views/profiles/avatar_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698