Chromium Code Reviews| 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..645c4227f4cb2a3f6cf44cdae081d471e170ab5d 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_)) { |
|
sky
2016/05/12 16:55:52
nit: no {}
|
| + return ash::TYPE_IME_MENU; |
| + } |
| switch (type_) { |
| case LauncherItemController::TYPE_SHORTCUT: |
| case LauncherItemController::TYPE_WINDOWED_APP: |