Remove LauncherItemController::type; use ShelfItems::type.

ash/common/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/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/ash_constants.h"
@@ skipping 579 matching lines @@
       WmShell::Get()->RecordUserMetricsAction(UMA_LAUNCHER_CLICK_ON_APP);
       break;
 
     case TYPE_APP_LIST:
       WmShell::Get()->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 =
       model_->GetShelfItemDelegate(model_->items()[last_pressed_index_].id)
           ->ItemSelected(event);
@@ skipping 457 matching lines @@
   overflow_button_->SetBoundsRect(ideal_bounds.overflow_bounds);
 }
 
 views::View* ShelfView::CreateViewForItem(const ShelfItem& item) {
   views::View* view = nullptr;
   switch (item.type) {
     case TYPE_APP_PANEL:
     case TYPE_APP_SHORTCUT:
     case TYPE_BROWSER_SHORTCUT:
     case TYPE_APP:
-    case TYPE_DIALOG:
-    case TYPE_IME_MENU: {
+    case TYPE_DIALOG: {
       ShelfButton* button = new ShelfButton(this, this);
       button->SetImage(item.image);
       ReflectItemStatus(item, button);
       view = button;
       break;
     }
 
     case TYPE_APP_LIST: {
       view = new AppListButton(this, this, wm_shelf_);
       break;
@@ skipping 306 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_PANEL:
     case TYPE_APP_LIST:
     case TYPE_APP:
     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 302 matching lines @@
       bounds_animator_->AnimateViewTo(new_view, old_ideal_bounds);
     return;
   }
 
   views::View* view = view_model_->view_at(model_index);
   switch (item.type) {
     case TYPE_APP_PANEL:
     case TYPE_APP_SHORTCUT:
     case TYPE_BROWSER_SHORTCUT:
     case TYPE_APP:
-    case TYPE_DIALOG:
-    case TYPE_IME_MENU: {
+    case TYPE_DIALOG: {
       CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName());
       ShelfButton* button = static_cast<ShelfButton*>(view);
       ReflectItemStatus(item, button);
       button->SetImage(item.image);
       button->SchedulePaint();
       break;
     }
 
     default:
       break;
@@ skipping 176 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = wm_shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash