Add ImeMenuTray element.

ash/shelf/shelf.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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/aura/wm_window_aura.h"
@@ skipping 18 matching lines @@
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
+#endif  // defined(OS_CHROMEOS)
+
 namespace ash {
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
              ShelfDelegate* shelf_delegate,
              WmShelf* wm_shelf,
              ShelfWidget* shelf_widget)
     : delegate_(shelf_delegate),
       wm_shelf_(wm_shelf),
@@ skipping 59 matching lines @@
   return shelf_widget_->shelf_layout_manager()->auto_hide_state();
 }
 
 ShelfVisibilityState Shelf::GetVisibilityState() const {
   return shelf_widget_->shelf_layout_manager()->visibility_state();
 }
 
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(
     const aura::Window* window) {
   ShelfID id = GetShelfIDForWindow(window);
-  gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
-  gfx::Point screen_origin;
-  views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
-  return gfx::Rect(screen_origin.x() + bounds.x(),
-                   screen_origin.y() + bounds.y(), bounds.width(),
-                   bounds.height());
+  gfx::Rect bounds;
+  gfx::Vector2d offset;
+#if defined(OS_CHROMEOS)
+  if (window->GetProperty(kShelfItemOnTrayForImeMenu)) {
+    // For opt-in IME menu, the item icon lays on the status tray.
+    bounds = shelf_widget_->status_area_widget()->ime_menu_tray()->bounds();
+    gfx::Rect status_area_bounds =
+        shelf_widget_->status_area_widget()->GetWindowBoundsInScreen();
+    offset = status_area_bounds.OffsetFromOrigin();
+  }

[James Cook, 2016/06/30 21:15:47]

nit: This might be easier to read with an early return for this case. You could
keep the original code for the non-ime-menu case. I think
kShelfItemOnTrayForImeMenu is only used on chromeos, right?

[Azure Wei, 2016/07/01 03:48:05]

Yes, kShelfItemOnTrayForImeMenu is only for ChromeOs. 
Adds early return here.

+#endif  // defined(OS_CHROMEOS)
+  if (!window->GetProperty(kShelfItemOnTrayForImeMenu)) {
+    bounds = (shelf_view_->GetIdealBoundsOfItemIcon(id));
+    gfx::Point screen_origin;
+    views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
+    offset = screen_origin.OffsetFromOrigin();
+  }
+  return bounds + offset;
 }
 
 void Shelf::UpdateIconPositionForWindow(aura::Window* window) {
   shelf_view_->UpdatePanelIconPosition(
       GetShelfIDForWindow(window),
       ScreenUtil::ConvertRectFromScreen(shelf_widget()->GetNativeView(),
                                         window->GetBoundsInScreen())
           .CenterPoint());
 }
 
@@ skipping 77 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash