CrOS md user row adjustments

ash/common/system/user/rounded_image_view.cc

 // Copyright 2014 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 "ash/common/system/user/rounded_image_view.h"
+
+#include "ash/common/material_design/material_design_controller.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 
 namespace ash {
 namespace tray {
 
@@ skipping 41 matching lines @@
   image_bounds.Inset(GetInsets());
   const SkScalar kRadius[8] = {
       SkIntToScalar(corner_radius_[0]), SkIntToScalar(corner_radius_[0]),
       SkIntToScalar(corner_radius_[1]), SkIntToScalar(corner_radius_[1]),
       SkIntToScalar(corner_radius_[2]), SkIntToScalar(corner_radius_[2]),
       SkIntToScalar(corner_radius_[3]), SkIntToScalar(corner_radius_[3])};
   SkPath path;
   path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius);
   SkPaint paint;
   paint.setAntiAlias(true);
-  paint.setBlendMode(active_user_ ? SkBlendMode::kSrcOver
-                                  : SkBlendMode::kLuminosity);
+  const bool grayscale =
+      !active_user_ && !MaterialDesignController::IsSystemTrayMenuMaterial();
+  paint.setBlendMode(grayscale ? SkBlendMode::kLuminosity
+                               : SkBlendMode::kSrcOver);
   canvas->DrawImageInPath(resized_, image_bounds.x(), image_bounds.y(), path,
                           paint);
 }
 
 }  // namespace tray
 }  // namespace ash