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

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 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/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"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/size_range_layout.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
@@ skipping 329 matching lines @@
   ink_drop->SetShowHighlightOnHover(false);
 
   return std::move(ink_drop);
 }
 
 std::unique_ptr<views::InkDropRipple> TrayPopupUtils::CreateInkDropRipple(
     TrayPopupInkDropStyle ink_drop_style,
     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;
+  return base::MakeUnique<views::FloodFillInkDropRipple>(
+      host->size(), TrayPopupUtils::GetInkDropInsets(ink_drop_style),
+      center_point, color, kTrayPopupInkDropRippleOpacity);
 }
 
 std::unique_ptr<views::InkDropHighlight> TrayPopupUtils::CreateInkDropHighlight(
     TrayPopupInkDropStyle ink_drop_style,
     const views::View* host,
     SkColor color) {
   const gfx::Rect bounds =
       TrayPopupUtils::GetInkDropBounds(ink_drop_style, host);
   std::unique_ptr<views::InkDropHighlight> highlight(
       new views::InkDropHighlight(bounds.size(), 0,
@@ skipping 79 matching lines @@
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash