| Index: chrome/browser/ui/ash/launcher/launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
|
| index 69fc8a4a23a8172d8a8a8001f8c02e7cd68b2277..e6f47426d54cac5cd54d153982a6f847e70204cc 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
|
|
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
| +#include "chrome/common/extensions/extension_constants.h"
|
|
|
| LauncherItemController::LauncherItemController(
|
| Type type,
|
| @@ -20,6 +21,9 @@ LauncherItemController::LauncherItemController(
|
| LauncherItemController::~LauncherItemController() {}
|
|
|
| ash::ShelfItemType LauncherItemController::GetShelfItemType() const {
|
| + if (extension_misc::IsImeMenuExtensionId(app_id_))
|
| + return ash::TYPE_IME_MENU;
|
| +
|
| switch (type_) {
|
| case LauncherItemController::TYPE_SHORTCUT:
|
| case LauncherItemController::TYPE_WINDOWED_APP:
|
|
|