Adjust positioning of cros tray bubbles.

ash/common/system/chromeos/palette/palette_tray.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/chromeos/palette/palette_tray.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 194 matching lines @@
 
   return ShowPalette();
 }
 
 bool PaletteTray::ShowPalette() {
   if (bubble_)
     return false;
 
   DCHECK(tray_container());
 
-  views::TrayBubbleView::InitParams init_params(
-      views::TrayBubbleView::ANCHOR_TYPE_TRAY, GetAnchorAlignment(),
-      kPaletteWidth, kPaletteWidth);
-  init_params.first_item_has_no_margin = true;
+  views::TrayBubbleView::InitParams init_params(GetAnchorAlignment(),
+                                                kPaletteWidth, kPaletteWidth);
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   DCHECK(tray_container());
 
   // The views::TrayBubbleView ctor will cause a shelf auto hide update check.
   // Make sure to block auto hiding before that check happens.
   should_block_shelf_auto_hide_ = true;
 
   // TODO(tdanderson): Refactor into common row layout code.
   // TODO(tdanderson|jdufault): Add material design ripple effects to the menu
   // rows.
 
   // Create and customize bubble view.
   views::TrayBubbleView* bubble_view =
-      views::TrayBubbleView::Create(tray_container(), this, &init_params);
-  bubble_view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
+      views::TrayBubbleView::Create(GetBubbleAnchor(), this, &init_params);
+  bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets());
   bubble_view->set_margins(
       gfx::Insets(kPalettePaddingOnTop, 0, kPalettePaddingOnBottom, 0));
 
   // Add title.
   auto* title_view = new TitleView(this);
   title_view->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(0, kPaddingBetweenTitleAndLeftEdge, 0, 0)));
   bubble_view->AddChildView(title_view);
 
   // Add horizontal separator.
@@ skipping 58 matching lines @@
 }
 
 void PaletteTray::OnMouseEnteredView() {}
 
 void PaletteTray::OnMouseExitedView() {}
 
 base::string16 PaletteTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
-gfx::Rect PaletteTray::GetAnchorRect(
-    views::Widget* anchor_widget,
-    views::TrayBubbleView::AnchorType anchor_type,
-    views::TrayBubbleView::AnchorAlignment anchor_alignment) const {
-  gfx::Rect r =
-      GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
-
-  // Move the palette to the left so the right edge of the palette aligns with
-  // the right edge of the tray button.
-  if (IsHorizontalAlignment(shelf_alignment())) {
-    // TODO(jdufault): Figure out a more robust adjustment method that does not
-    // break in md-shelf.
-    int icon_size = tray_container()->width();
-    if (tray_container()->border())
-      icon_size -= tray_container()->border()->GetInsets().width();
-
-    r.Offset(-r.width() + icon_size + x(), 0);
-  } else {
-    // Vertical layout doesn't need the border adjustment that horizontal needs.
-    r.Offset(0, -r.height() + tray_container()->height());
-  }
-
-  return r;
-}
-
 void PaletteTray::OnBeforeBubbleWidgetInit(
     views::Widget* anchor_widget,
     views::Widget* bubble_widget,
     views::Widget::InitParams* params) const {
   // Place the bubble in the same root window as |anchor_widget|.
   WmLookup::Get()
       ->GetWindowForWidget(anchor_widget)
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           bubble_widget, kShellWindowId_SettingBubbleContainer, params);
@@ skipping 114 matching lines @@
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(IsInUserSession());
 }
 
 }  // namespace ash