Make the IME menu panel more system-like.

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 968 matching lines @@
 }
 
 views::View* ShelfView::CreateViewForItem(const ShelfItem& item) {
   views::View* view = nullptr;
   switch (item.type) {
     case TYPE_BROWSER_SHORTCUT:
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_DIALOG:
-    case TYPE_APP_PANEL: {
+    case TYPE_APP_PANEL:
+    case TYPE_IME_MENU: {
       ShelfButton* button = new ShelfButton(this);
       button->SetImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
     case TYPE_APP_LIST: {
       view = new AppListButton(this);
       break;
@@ skipping 305 matching lines @@
 bool ShelfView::SameDragType(ShelfItemType typea, ShelfItemType typeb) const {
   switch (typea) {
     case TYPE_APP_SHORTCUT:
     case TYPE_BROWSER_SHORTCUT:
       return (typeb == TYPE_APP_SHORTCUT || typeb == TYPE_BROWSER_SHORTCUT);
     case TYPE_APP_LIST:
     case TYPE_PLATFORM_APP:
     case TYPE_WINDOWED_APP:
     case TYPE_APP_PANEL:
     case TYPE_DIALOG:
+    case TYPE_IME_MENU:
       return typeb == typea;
     case TYPE_UNDEFINED:
       NOTREACHED() << "ShelfItemType must be set.";
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 std::pair<int, int> ShelfView::GetDragRange(int index) {
@@ skipping 301 matching lines @@
 
   views::View* view = view_model_->view_at(model_index);
   switch (item.type) {
     case TYPE_BROWSER_SHORTCUT:
       // Fallthrough for the new Shelf since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_DIALOG:
-    case TYPE_APP_PANEL: {
+    case TYPE_APP_PANEL:
+    case TYPE_IME_MENU: {
       CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName());
       ShelfButton* button = static_cast<ShelfButton*>(view);
       ReflectItemStatus(item, button);
       // The browser shortcut is currently not a "real" item and as such the
       // the image is bogous as well. We therefore keep the image as is for it.
       if (item.type != TYPE_BROWSER_SHORTCUT)
         button->SetImage(item.image);
       button->SchedulePaint();
       break;
     }
@@ skipping 66 matching lines @@
             UMA_LAUNCHER_CLICK_ON_APP);
         break;
 
       case TYPE_APP_LIST:
         Shell::GetInstance()->metrics()->RecordUserMetricsAction(
             UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON);
         break;
 
       case TYPE_APP_PANEL:
       case TYPE_DIALOG:
+      case TYPE_IME_MENU:
         break;
 
       case TYPE_UNDEFINED:
         NOTREACHED() << "ShelfItemType must be set.";
         break;
     }
 
     ShelfItemDelegate::PerformedAction performed_action =
         item_manager_->GetShelfItemDelegate(model_->items()[view_index].id)
             ->ItemSelected(event);
@@ skipping 150 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