Only assume the Win 10 frame is white when using the native frame.

chrome/browser/ui/views/frame/browser_view.cc

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 f2b7401e389999159afe205b46fa83de52aab756..91f856c1a1d1c1267d1adaaa990625cc9a51540c 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -682,8 +682,10 @@ gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     SkColor icon_color = SK_ColorWHITE;
 #if defined(OS_WIN)
-    // On Windows 10, we can't change the frame color so must assume it's white.
-    if (base::win::GetVersion() == base::win::VERSION_WIN10)
+    // On Windows 10+, we assume the native frame color is white.
+    // TODO(pkasting): Read the correct frame color from the registry or APIs.
+    if (GetWidget() && GetWidget()->ShouldUseNativeFrame() &&

[Evan Stade, 2016/02/10 22:45:37]

nit: i prefer curlies in this case (multi-line conditional)

+        (base::win::GetVersion() >= base::win::VERSION_WIN10))
       icon_color = gfx::kChromeIconGrey;
 #endif
     return gfx::CreateVectorIcon(gfx::VectorIconId::INCOGNITO, 24, icon_color);