Refactor LauncherItemController and LauncherItemDelegate

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

 // Copyright (c) 2013 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/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
+#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ash_resources.h"
 #include "grit/chromium_strings.h"
@@ skipping 62 matching lines @@
         browser_status = ash::STATUS_RUNNING;
     }
   }
 
   if (browser_status != browser_item.status) {
     browser_item.status = browser_status;
     model->Set(browser_index, browser_item);
   }
 }
 
-string16 BrowserShortcutLauncherItemController::GetTitle() {
-  return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-}
-
 bool BrowserShortcutLauncherItemController::IsCurrentlyShownInWindow(
     aura::Window* window) const {
   const BrowserList* ash_browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     // During browser creation it is possible that this function is called
     // before a browser got a window (see crbug.com/263563).
     if ((*it)->window() &&
         (*it)->window()->GetNativeWindow() == window)
@@ skipping 36 matching lines @@
     return;
   }
 
   launcher_controller()->ActivateWindowOrMinimizeIfActive(
       last_browser->window(), GetApplicationList(0).size() == 2);
 }
 
 void BrowserShortcutLauncherItemController::Close() {
 }
 
-void BrowserShortcutLauncherItemController::Clicked(const ui::Event& event) {
-  #if defined(OS_CHROMEOS)
-    chromeos::default_pinned_apps_field_trial::RecordShelfClick(
-        chromeos::default_pinned_apps_field_trial::CHROME);
-  #endif
-
-  if (event.flags() & ui::EF_CONTROL_DOWN) {
-    launcher_controller()->CreateNewWindow();
-    return;
-  }
-
-  // In case of a keyboard event, we were called by a hotkey. In that case we
-  // activate the next item in line if an item of our list is already active.
-  if (event.type() & ui::ET_KEY_RELEASED) {
-    ActivateOrAdvanceToNextBrowser();
-    return;
-  }
-
-  Activate();
-}
-
 void BrowserShortcutLauncherItemController::OnRemoved() {
   // BrowserShortcutLauncherItemController is owned by ChromeLauncherController.
 }
 
 ChromeLauncherAppMenuItems
 BrowserShortcutLauncherItemController::GetApplicationList(int event_flags) {
   ChromeLauncherAppMenuItems items;
   bool found_tabbed_browser = false;
   // Add the application name to the menu.
   items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false));
@@ skipping 36 matching lines @@
       }
     }
   }
   // If only windowed applications are open, we return an empty list to
   // enforce the creation of a new browser.
   if (!found_tabbed_browser)
     items.clear();
   return items.Pass();
 }
 
+void BrowserShortcutLauncherItemController::ItemSelected(
+    const ui::Event& event) {
+  #if defined(OS_CHROMEOS)
+    chromeos::default_pinned_apps_field_trial::RecordShelfClick(
+        chromeos::default_pinned_apps_field_trial::CHROME);
+  #endif
+
+  if (event.flags() & ui::EF_CONTROL_DOWN) {
+    launcher_controller()->CreateNewWindow();
+    return;
+  }
+
+  // In case of a keyboard event, we were called by a hotkey. In that case we
+  // activate the next item in line if an item of our list is already active.
+  if (event.type() & ui::ET_KEY_RELEASED) {
+    ActivateOrAdvanceToNextBrowser();
+    return;
+  }
+
+  Activate();
+}
+
+string16 BrowserShortcutLauncherItemController::GetTitle() {
+  return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+}
+
+ui::MenuModel* BrowserShortcutLauncherItemController::CreateContextMenu(
+    aura::RootWindow* root_window) {
+  ash::LauncherItem item =
+      *(launcher_controller()->model()->ItemByID(launcher_id()));
+  return new LauncherContextMenu(launcher_controller(), &item, root_window);
+}
+
+ash::LauncherMenuModel*
+BrowserShortcutLauncherItemController::CreateApplicationMenu(int event_flags) {
+  return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
+}
+
+bool BrowserShortcutLauncherItemController::IsDraggable() {
+  return launcher_controller()->CanPin() ? true : false;
+}
+
+bool BrowserShortcutLauncherItemController::ShouldShowTooltip() {
+  return true;
+}
+
 gfx::Image BrowserShortcutLauncherItemController::GetBrowserListIcon(
     content::WebContents* web_contents) const {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetImageNamed(IsIncognito(web_contents) ?
       IDR_AURA_LAUNCHER_LIST_INCOGNITO_BROWSER :
       IDR_AURA_LAUNCHER_LIST_BROWSER);
 }
 
 string16 BrowserShortcutLauncherItemController::GetBrowserListTitle(
     content::WebContents* web_contents) const {
@@ skipping 63 matching lines @@
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   return (browser &&
           (browser->is_type_tabbed() ||
            !browser->is_app() ||
            !browser->is_type_popup() ||
            launcher_controller()->
                GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(
                    browser->app_name())) <= 0));
 }