[ash-md] Removed 'experimental' path from TrayPopupUtils::CreateInkDropRipple().

ash/common/system/tray/tray_popup_utils.cc

Index: ash/common/system/tray/tray_popup_utils.cc
diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc
index 608d5679547b067eda283d05e6a9bc762dcf7777..f5874b9eb37ca5725e5e36fa02f530b4259c4f0e 100644
--- a/ash/common/system/tray/tray_popup_utils.cc
+++ b/ash/common/system/tray/tray_popup_utils.cc
@@ -4,6 +4,9 @@
 
 #include "ash/common/system/tray/tray_popup_utils.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ -353,30 +356,10 @@ std::unique_ptr<views::InkDropRipple> TrayPopupUtils::CreateInkDropRipple(
     const views::View* host,
     const gfx::Point& center_point,
     SkColor color) {
-  const gfx::Rect bounds =
-      TrayPopupUtils::GetInkDropBounds(ink_drop_style, host);
-  switch (ink_drop_style) {
-    case TrayPopupInkDropStyle::HOST_CENTERED:
-      if (MaterialDesignController::GetMode() ==
-          MaterialDesignController::MATERIAL_EXPERIMENTAL) {
-        return base::MakeUnique<views::SquareInkDropRipple>(
-            bounds.size(), bounds.size().width() / 2, bounds.size(),
-            bounds.size().width() / 2, center_point, bounds.CenterPoint(),
-            color, kTrayPopupInkDropRippleOpacity);
-      }
-    // Intentional fall through.
-    case TrayPopupInkDropStyle::INSET_BOUNDS:
-    case TrayPopupInkDropStyle::FILL_BOUNDS: {
-      const gfx::Insets insets =
-          TrayPopupUtils::GetInkDropInsets(ink_drop_style);
-      return base::MakeUnique<views::FloodFillInkDropRipple>(
-          host->size(), insets, center_point, color,
-          kTrayPopupInkDropRippleOpacity);
-    }
-  }
-  // Required for some compilers.
-  NOTREACHED();
-  return nullptr;
+  const gfx::Insets insets = TrayPopupUtils::GetInkDropInsets(ink_drop_style);

[tdanderson, 2017/02/01 21:02:03]

nit: only used once, so you can probably just inline this rather than
introducing a variable

[bruthig, 2017/02/02 00:19:59]

Done.

+  return base::MakeUnique<views::FloodFillInkDropRipple>(
+      host->size(), insets, center_point, color,
+      kTrayPopupInkDropRippleOpacity);
 }
 
 std::unique_ptr<views::InkDropHighlight> TrayPopupUtils::CreateInkDropHighlight(