[ash] Add TYPE_DIALOG and its item's LauncherContextMenu

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include <string>
 
 #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"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
@@ skipping 13 matching lines @@
 
 }  // namespace
 
 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
                                          const ash::LauncherItem* item,
                                          aura::Window* root)
     : ui::SimpleMenuModel(NULL),
       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();
 }
 
 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
                                          aura::Window* root)
     : ui::SimpleMenuModel(NULL),
       controller_(controller),
       item_(ash::LauncherItem()),
       shelf_alignment_menu_(root),
       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();
 }
 
 void LauncherContextMenu::Init() {
   extension_items_.reset(new extensions::ContextMenuMatcher(
       controller_->profile(), this, this,
       base::Bind(MenuItemHasLauncherContext)));
   set_delegate(this);
 
@@ skipping 42 matching lines @@
               IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
         }
       }
     } else if (item_.type == ash::TYPE_BROWSER_SHORTCUT) {
       AddItem(MENU_NEW_WINDOW,
               l10n_util::GetStringUTF16(IDS_LAUNCHER_NEW_WINDOW));
       if (!controller_->IsLoggedInAsGuest()) {
         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(
             MENU_PIN,
             l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_PIN));
       }
       if (controller_->IsOpen(item_.id)) {
         AddItem(MENU_CLOSE,
                 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
       }
@@ skipping 106 matching lines @@
       ui::Accelerator* accelerator) {
   return false;
 }
 
 void LauncherContextMenu::ExecuteCommand(int command_id, int event_flags) {
   switch (static_cast<MenuItem>(command_id)) {
     case MENU_OPEN_NEW:
       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;
     case MENU_PIN:
       controller_->TogglePinned(item_.id);
       break;
     case LAUNCH_TYPE_PINNED_TAB:
       controller_->SetLaunchType(item_.id, extensions::LAUNCH_TYPE_PINNED);
       break;
     case LAUNCH_TYPE_REGULAR_TAB: {
@@ skipping 32 matching lines @@
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
 #endif
     default:
       extension_items_->ExecuteCommand(command_id, NULL,
                                        content::ContextMenuParams());
   }
 }