[ash-md] Updates ash shelf tooltips to MD

ui/views/bubble/bubble_frame_view.cc

 // Copyright (c) 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 "ui/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 154 matching lines @@
       return HTSYSMENU;
     if (point.y() < title_->bounds().bottom())
       return HTCAPTION;
   }
 
   return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
+  const bool no_assets = bubble_border_->shadow() == BubbleBorder::NO_ASSETS ||
+      bubble_border_->shadow() == BubbleBorder::NO_ASSETS_TOOLTIP;
   if (bubble_border_->shadow() != BubbleBorder::SMALL_SHADOW &&
       bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER &&
-      bubble_border_->shadow() != BubbleBorder::NO_ASSETS)
+      !no_assets)
     return;
 
   // We don't return a mask for windows with arrows unless they use
-  // BubbleBorder::NO_ASSETS.
-  if (bubble_border_->shadow() != BubbleBorder::NO_ASSETS &&
+  // BubbleBorder::NO_ASSETS or BubbleBorder::NO_ASSETS_TOOLTIP.
+  if (!no_assets &&
       bubble_border_->arrow() != BubbleBorder::NONE &&
       bubble_border_->arrow() != BubbleBorder::FLOAT)
     return;
 
   // Use a window mask roughly matching the border in the image assets.
-  const int kBorderStrokeSize =
-      bubble_border_->shadow() == BubbleBorder::NO_ASSETS ? 0 : 1;
+  const int kBorderStrokeSize = no_assets ? 0 : 1;
   const SkScalar kCornerRadius =
       SkIntToScalar(bubble_border_->GetBorderCornerRadius());
   const gfx::Insets border_insets = bubble_border_->GetInsets();
   SkRect rect = {
       SkIntToScalar(border_insets.left() - kBorderStrokeSize),
       SkIntToScalar(border_insets.top() - kBorderStrokeSize),
       SkIntToScalar(size.width() - border_insets.right() + kBorderStrokeSize),
       SkIntToScalar(size.height() - border_insets.bottom() +
                     kBorderStrokeSize)};
 
   if (bubble_border_->shadow() == BubbleBorder::NO_SHADOW_OPAQUE_BORDER ||
-      bubble_border_->shadow() == BubbleBorder::NO_ASSETS) {
+      no_assets) {
     window_mask->addRoundRect(rect, kCornerRadius, kCornerRadius);
   } else {
     static const int kBottomBorderShadowSize = 2;
     rect.fBottom += SkIntToScalar(kBottomBorderShadowSize);
     window_mask->addRect(rect);
   }
   gfx::Path arrow_path;
   if (bubble_border_->GetArrowPath(gfx::Rect(size), &arrow_path))
     window_mask->addPath(arrow_path, 0, 0);
 }
@@ skipping 302 matching lines @@
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
   if (footnote_container_)
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views