[ash-md] Updates ash shelf tooltips to MD

ash/shelf/shelf_tooltip_manager.cc

 // Copyright 2013 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/shelf/shelf_tooltip_manager.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
-const int kTooltipTopBottomMargin = 3;
-const int kTooltipLeftRightMargin = 10;
 const int kTooltipAppearanceDelay = 1000;  // msec
-const int kTooltipMinHeight = 29 - 2 * kTooltipTopBottomMargin;
-const SkColor kTooltipTextColor = SkColorSetRGB(0x22, 0x22, 0x22);
+
+// Tooltip layout constants.
+
+// Shelf item tooltip height.
+const int kTooltipHeight = 24;
 
 // The maximum width of the tooltip bubble.  Borrowed the value from
 // ash/tooltip/tooltip_controller.cc
 const int kTooltipMaxWidth = 250;
 
-// The offset for the tooltip bubble - making sure that the bubble is flush
-// with the shelf. The offset includes the arrow size in pixels as well as
-// the activation bar and other spacing elements.
-const int kArrowOffsetLeftRight = 11;
-const int kArrowOffsetTopBottom = 7;
+// Shelf item tooltip internal text margins.
+const int kTooltipTopBottomMargin = 4;
+const int kTooltipLeftRightMargin = 8;
+
+// The offset for the tooltip bubble - making sure that the bubble is spaced
+// with a fixed gap. The gap is accounted for by the transparent arrow in the
+// bubble and an additional 1px padding for the shelf item views.

[James Cook, 2016/07/25 17:01:08]

I like that you write detailed documentation for layout constants.

[varkha, 2016/07/26 19:19:59]

Acknowledged.

+const int kArrowTopBottomOffset = 1;
+const int kArrowLeftRightOffset = 1;
+
+// Tooltip's border interior thickness that defines its minimum height.
+const int kBorderInteriorThickness = kTooltipHeight / 2;
 
 }  // namespace
 
 // The implementation of tooltip of the launcher.
 class ShelfTooltipManager::ShelfTooltipBubble
     : public views::BubbleDialogDelegateView {
  public:
   ShelfTooltipBubble(views::View* anchor,
                      views::BubbleBorder::Arrow arrow,
                      const base::string16& text)
       : views::BubbleDialogDelegateView(anchor, arrow) {
     gfx::Insets insets =

[James Cook, 2016/07/25 17:01:08]

nit: Just gfx::Insets insets(value, value);

[varkha, 2016/07/26 19:20:00]

Done.

-        gfx::Insets(kArrowOffsetTopBottom, kArrowOffsetLeftRight);
+        gfx::Insets(kArrowTopBottomOffset, kArrowLeftRightOffset);
     // Adjust the anchor location for asymmetrical borders of shelf item.
     if (anchor->border())
       insets += anchor->border()->GetInsets();
 
     set_anchor_view_insets(insets);
     set_close_on_deactivate(false);
     set_can_activate(false);
     set_accept_events(false);
     set_margins(gfx::Insets(kTooltipTopBottomMargin, kTooltipLeftRightMargin));
-    set_shadow(views::BubbleBorder::SMALL_SHADOW);
+    set_shadow(views::BubbleBorder::NO_ASSETS);
     SetLayoutManager(new views::FillLayout());
     // The anchor may not have the widget in tests.
     if (anchor->GetWidget() && anchor->GetWidget()->GetNativeWindow()) {
       set_parent_window(ash::Shell::GetContainer(
           anchor->GetWidget()->GetNativeWindow()->GetRootWindow(),
           ash::kShellWindowId_SettingBubbleContainer));
     }
     views::Label* label = new views::Label(text);
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    label->SetEnabledColor(kTooltipTextColor);
+    ui::NativeTheme* theme = anchor->GetWidget()->GetNativeTheme();
+    label->SetEnabledColor(
+        theme->GetSystemColor(ui::NativeTheme::kColorId_TooltipText));

[James Cook, 2016/07/25 17:01:08]

Just for my knowledge, is this the usual way of getting MD colors (e.g. via
GetSystemColor -> GetAuraColor in ui/native_theme/common_theme.cc)?

[varkha, 2016/07/26 19:20:00]

In this case we want the color to match the top chrome and this is what the top
chrome was using for tooltips.

+    SkColor background_color =
+        theme->GetSystemColor(ui::NativeTheme::kColorId_TooltipBackground);
+    set_color(background_color);
+    label->SetBackgroundColor(background_color);
     AddChildView(label);
     views::BubbleDialogDelegateView::CreateBubble(this);
+    // The bubble border has its own background so the background created by the
+    // BubbleDialogDelegateView is redundant and would cause extra opacity.
+    set_background(nullptr);
+    SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
+    SetBorderInteriorThickness(kBorderInteriorThickness);
   }
 
  private:
   // BubbleDialogDelegateView overrides:
   gfx::Size GetPreferredSize() const override {
     const gfx::Size size = BubbleDialogDelegateView::GetPreferredSize();
+    const int kTooltipMinHeight = kTooltipHeight - 2 * kTooltipTopBottomMargin;
     return gfx::Size(std::min(size.width(), kTooltipMaxWidth),
                      std::max(size.height(), kTooltipMinHeight));
   }
 
   int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
 };
 
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
@@ skipping 154 matching lines @@
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
   return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&
          shelf_layout_manager_ && shelf_layout_manager_->IsVisible();
 }
 
 }  // namespace ash