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

Unified Diff: ash/shelf/shelf_view.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_model.cc ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index ffa1141d40b76bf2f796cedc0567a751690ef307..d59ff70ae5017f478bb676ccea6c496387cdf5de 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -986,7 +986,8 @@ views::View* ShelfView::CreateViewForItem(const ShelfItem& item) {
case TYPE_WINDOWED_APP:
case TYPE_PLATFORM_APP:
case TYPE_DIALOG:
- case TYPE_APP_PANEL: {
+ case TYPE_APP_PANEL:
+ case TYPE_IME_MENU: {
ShelfButton* button = new ShelfButton(this);
button->SetImage(item.image);
ReflectItemStatus(item, button);
@@ -1312,6 +1313,7 @@ bool ShelfView::SameDragType(ShelfItemType typea, ShelfItemType typeb) const {
case TYPE_WINDOWED_APP:
case TYPE_APP_PANEL:
case TYPE_DIALOG:
+ case TYPE_IME_MENU:
return typeb == typea;
case TYPE_UNDEFINED:
NOTREACHED() << "ShelfItemType must be set.";
@@ -1633,7 +1635,8 @@ void ShelfView::ShelfItemChanged(int model_index, const ShelfItem& old_item) {
case TYPE_WINDOWED_APP:
case TYPE_PLATFORM_APP:
case TYPE_DIALOG:
- case TYPE_APP_PANEL: {
+ case TYPE_APP_PANEL:
+ case TYPE_IME_MENU: {
CHECK_EQ(ShelfButton::kViewClassName, view->GetClassName());
ShelfButton* button = static_cast<ShelfButton*>(view);
ReflectItemStatus(item, button);
@@ -1720,6 +1723,7 @@ void ShelfView::ButtonPressed(views::Button* sender, const ui::Event& event) {
case TYPE_APP_PANEL:
case TYPE_DIALOG:
+ case TYPE_IME_MENU:
break;
case TYPE_UNDEFINED:
« no previous file with comments | « ash/shelf/shelf_model.cc ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698