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

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 664 matching lines @@
 }
 
 WebContents* BrowserView::GetActiveWebContents() const {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 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);
   }
 
   // GetThemeProvider() can return null if this view is not yet part of the
   // widget hierarchy, but the frame's theme provider is always valid.
   return *frame_->GetThemeProvider()->GetImageSkiaNamed(IDR_OTR_ICON);
 }
 
@@ skipping 2000 matching lines @@
   return GetWidget()->GetClientAreaBoundsInScreen();
 }
 
 bool BrowserView::IsImmersiveModeEnabled() {
   return immersive_mode_controller()->IsEnabled();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }