Adjust positioning of cros tray bubbles.

ash/common/system/chromeos/ime_menu/ime_menu_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/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 299 matching lines @@
 
 ImeMenuTray::~ImeMenuTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
   WmShell::Get()->system_tray_notifier()->RemoveIMEObserver(this);
 }
 
 void ImeMenuTray::ShowImeMenuBubble() {
   should_block_shelf_auto_hide_ = true;
   views::TrayBubbleView::InitParams init_params(
-      views::TrayBubbleView::ANCHOR_TYPE_TRAY, GetAnchorAlignment(),
-      kTrayPopupMinWidth, kTrayPopupMaxWidth);
-  init_params.first_item_has_no_margin = true;
+      GetAnchorAlignment(), kTrayPopupMinWidth, kTrayPopupMaxWidth);
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   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());
 
   // In the material design, we will add a title item with a separator on the
   // top of the IME menu.
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
     bubble_view->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
     bubble_view->AddChildView(
         new ImeTitleView(!ShouldShowEmojiHandwritingVoiceButtons()));
   } else {
     bubble_view->set_margins(gfx::Insets(7, 0, 0, 0));
@@ skipping 144 matching lines @@
 }
 
 void ImeMenuTray::OnMouseEnteredView() {}
 
 void ImeMenuTray::OnMouseExitedView() {}
 
 base::string16 ImeMenuTray::GetAccessibleNameForBubble() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
 
-gfx::Rect ImeMenuTray::GetAnchorRect(views::Widget* anchor_widget,
-                                     AnchorType anchor_type,
-                                     AnchorAlignment anchor_alignment) const {
-  gfx::Rect rect =
-      GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
-
-  if (IsHorizontalAlignment(shelf_alignment())) {
-    // Moves the bubble to make its center aligns the center of the tray.
-    int horizontal_offset =
-        -rect.width() + (tray_container()->width() + kTrayPopupMinWidth) / 2;
-    rect.Offset(horizontal_offset, 0);
-  } else {
-    // For vertical alignment, sets the bubble's bottom aligned to the bottom
-    // of the icon for now.
-    int vertical_offset = -rect.height() + tray_container()->height();
-    rect.Offset(0, vertical_offset);
-  }
-  return rect;
-}
-
 void ImeMenuTray::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 40 matching lines @@
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash