Add ImeMenuTray element.

ash/shelf/shelf_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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/ash_constants.h"
@@ skipping 815 matching lines @@
     view_model_->set_ideal_bounds(i, gfx::Rect(x, y, w, h));
     x = shelf_->PrimaryAxisValue(x + w + button_spacing, x);
     y = shelf_->PrimaryAxisValue(y, y + h + button_spacing);
   }
 
   if (is_overflow_mode()) {
     const_cast<ShelfView*>(this)->UpdateAllButtonsVisibilityInOverflowMode();
     return;
   }
 
+  // IME menu icon.

[sky, 2016/05/20 16:23:39]

This comment isn't helpful. It should describe what this code is doing, why we
need to special case the ime menu.

[Azure Wei, 2016/05/24 07:21:16]

Updated.

+  int last_item_index = view_model_->view_size() - 1;
+  bool is_last_item_menu =

[sky, 2016/05/20 16:23:39]

is_last_item_ime_menu

[Azure Wei, 2016/05/24 07:21:16]

Done.

+      (last_item_index >= 0) &&
+      (model_->items()[last_item_index].type == TYPE_IME_MENU);
+  if (is_last_item_menu) {
+    x = shelf_->PrimaryAxisValue(available_size - w, 0);
+    y = shelf_->PrimaryAxisValue(0, available_size - h);
+    view_model_->set_ideal_bounds(last_item_index, gfx::Rect(x, y, w, h));
+    --last_item_index;
+    available_size = shelf_->PrimaryAxisValue(x, y);
+  }
+
   // Right aligned icons.
   int end_position = available_size - button_spacing;
   x = shelf_->PrimaryAxisValue(end_position, 0);
   y = shelf_->PrimaryAxisValue(0, end_position);
-  for (int i = view_model_->view_size() - 1;
-       i >= first_panel_index; --i) {
+  for (int i = last_item_index; i >= first_panel_index; --i) {
     x = shelf_->PrimaryAxisValue(x - w - button_spacing, x);
     y = shelf_->PrimaryAxisValue(y, y - h - button_spacing);
     view_model_->set_ideal_bounds(i, gfx::Rect(x, y, w, h));
     end_position = shelf_->PrimaryAxisValue(x, y);
   }
 
   // Icons on the left / top are guaranteed up to kLeftIconProportion of
   // the available space.
   int last_icon_position =
       shelf_->PrimaryAxisValue(
@@ skipping 1035 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash