Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1444)

Unified Diff: chrome/browser/ui/ash/launcher/launcher_item_controller.cc

Issue 1978443002: Make the IME menu panel more system-like. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « ash/shelf/shelf_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698