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

ash/common/shelf/shelf_model.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/common/shelf/shelf_model.h"
 
 #include <algorithm>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
@@ skipping 10 matching lines @@
       return 0;
     case TYPE_BROWSER_SHORTCUT:
     case TYPE_APP_SHORTCUT:
       return 1;
     case TYPE_APP:
       return 2;
     case TYPE_DIALOG:
       return 3;
     case TYPE_APP_PANEL:
       return 4;
-    case TYPE_IME_MENU:
-      return 5;
     case TYPE_UNDEFINED:
       NOTREACHED() << "ShelfItemType must be set";
       return -1;
   }
 
   NOTREACHED() << "Invalid type " << type;
   return 1;
 }
 
 bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
@@ skipping 157 matching lines @@
 
   return index;
 }
 
 void ShelfModel::RemoveShelfItemDelegate(ShelfID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end())
     id_to_item_delegate_map_.erase(id);
 }
 
 }  // namespace ash