[ash] Add TYPE_DIALOG and its item's LauncherContextMenu

chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index 80c4d7f73d8fff9dc9ea2547f777e2284af6dbdd..2c417b042ac736ee0781ae4ce3df0b1b8bf9fb0a 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -9,6 +9,7 @@
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/bind.h"
@@ -42,7 +43,24 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
       controller_(controller),
       item_(*item),
       shelf_alignment_menu_(root),
-      root_window_(root) {
+      root_window_(root),
+      item_delegate_(NULL) {
+  DCHECK(item);
+  DCHECK(root_window_);
+  Init();
+}
+
+LauncherContextMenu::LauncherContextMenu(
+    ChromeLauncherController* controller,
+    ash::ShelfItemDelegate* item_delegate,
+    ash::LauncherItem* item,
+    aura::Window* root)
+    : ui::SimpleMenuModel(NULL),
+      controller_(controller),
+      item_(*item),
+      shelf_alignment_menu_(root),
+      root_window_(root),
+      item_delegate_(item_delegate) {
   DCHECK(item);
   DCHECK(root_window_);
   Init();
@@ -57,7 +75,8 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
       extension_items_(new extensions::ContextMenuMatcher(
           controller->profile(), this, this,
           base::Bind(MenuItemHasLauncherContext))),
-      root_window_(root) {
+      root_window_(root),
+      item_delegate_(NULL) {
   DCHECK(root_window_);
   Init();
 }
@@ -120,6 +139,9 @@ void LauncherContextMenu::Init() {
         AddItem(MENU_NEW_INCOGNITO_WINDOW,
                 l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_INCOGNITO_WINDOW));
       }
+    } else if (item_.type == ash::TYPE_DIALOG) {
+      AddItem(MENU_CLOSE,
+              l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
     } else {
       if (item_.type == ash::TYPE_PLATFORM_APP) {
         AddItem(
@@ -246,7 +268,12 @@ void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {
       controller_->Launch(item_.id, ui::EF_NONE);
       break;
     case MENU_CLOSE:
-      controller_->Close(item_.id);
+      if (item_.type == ash::TYPE_DIALOG) {
+        DCHECK(item_delegate_);
+        item_delegate_->Close();
+      } else {
+        controller_->Close(item_.id);

[sky, 2014/01/08 14:39:14]

Why can'
t controller_->Close(item_.id); do the right thing here? Meaning go through the
ShelfItemDelegate?

[simonhong, 2014/01/09 00:38:24]

Yes, TYPE_DIALOG is not managed by controller_.
I think using a ShelfItemDelegate interface for Close(), IsOpen() and etc is
better not through controller_.
How about this refactoring as a TODO?

+      }
       ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
           ash::UMA_CLOSE_THROUGH_CONTEXT_MENU);
       break;