Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
@@ skipping 110 matching lines @@
   if (!browser || !IsBrowserFromActiveUser(browser) ||
       IsSettingsBrowser(browser))
     return;
 
   ash::WmWindow::Get(browser->window()->GetNativeWindow())
       ->SetIntProperty(
           ash::WmWindowProperty::SHELF_ID,
           launcher_controller()->GetShelfIDForWebContents(web_contents));
 }
 
-ash::ShelfItemDelegate::PerformedAction
-BrowserShortcutLauncherItemController::Activate(ash::LaunchSource source) {
+ash::ShelfAction BrowserShortcutLauncherItemController::ItemSelected(
+    ui::EventType event_type,
+    int event_flags,
+    int64_t display_id,
+    ash::ShelfLaunchSource source) {
+  if (event_flags & ui::EF_CONTROL_DOWN) {
+    chrome::NewEmptyWindow(launcher_controller()->profile());
+    return ash::SHELF_ACTION_NEW_WINDOW_CREATED;
+  }
+
+  // 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)
+    return ActivateOrAdvanceToNextBrowser();
+
   Browser* last_browser =
       chrome::FindTabbedBrowser(launcher_controller()->profile(), true);
 
   if (!last_browser) {
     chrome::NewEmptyWindow(launcher_controller()->profile());
-    return kNewWindowCreated;
+    return ash::SHELF_ACTION_NEW_WINDOW_CREATED;
   }
 
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
       last_browser->window(), GetAppMenuItems(0).size() == 1);
 }
 
-ash::ShelfItemDelegate::PerformedAction
-BrowserShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
-  if (event.flags() & ui::EF_CONTROL_DOWN) {
-    chrome::NewEmptyWindow(launcher_controller()->profile());
-    return kNewWindowCreated;
-  }
-
-  // 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)
-    return ActivateOrAdvanceToNextBrowser();
-
-  return Activate(ash::LAUNCH_FROM_UNKNOWN);
-}
-
 ash::ShelfAppMenuItemList
 BrowserShortcutLauncherItemController::GetAppMenuItems(int event_flags) {
   ash::ShelfAppMenuItemList items;
   bool found_tabbed_browser = false;
   for (auto* browser : GetListOfActiveBrowsers()) {
     TabStripModel* tab_strip = browser->tab_strip_model();
     if (tab_strip->active_index() == -1)
       continue;
     if (browser->is_type_tabbed())
       found_tabbed_browser = true;
@@ skipping 49 matching lines @@
   return l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
 }
 
 bool BrowserShortcutLauncherItemController::IsIncognito(
     content::WebContents* web_contents) const {
   const Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   return profile->IsOffTheRecord() && !profile->IsGuestSession();
 }
 
-ash::ShelfItemDelegate::PerformedAction
+ash::ShelfAction
 BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
   // Create a list of all suitable running browsers.
   std::vector<Browser*> items;
   // We use the list in the order of how the browsers got created - not the LRU
   // order.
   const BrowserList* browser_list = BrowserList::GetInstance();
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end(); ++it) {
     if (IsBrowserRepresentedInBrowserList(*it))
       items.push_back(*it);
   }
   // If there are no suitable browsers we create a new one.
   if (items.empty()) {
     chrome::NewEmptyWindow(launcher_controller()->profile());
-    return kNewWindowCreated;
+    return ash::SHELF_ACTION_NEW_WINDOW_CREATED;
   }
   Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
   if (items.size() == 1) {
     // If there is only one suitable browser, we can either activate it, or
     // bounce it (if it is already active).
     if (browser == items[0]) {
       AnimateWindow(browser->window()->GetNativeWindow(),
                     wm::WINDOW_ANIMATION_TYPE_BOUNCE);
-      return kNoAction;
+      return ash::SHELF_ACTION_NONE;
     }
     browser = items[0];
   } else {
     // If there is more than one suitable browser, we advance to the next if
     // |browser| is already active - or - check the last used browser if it can
     // be used.
     std::vector<Browser*>::iterator i =
         std::find(items.begin(), items.end(), browser);
     if (i != items.end()) {
       browser = (++i == items.end()) ? items[0] : *i;
     } else {
       browser =
           chrome::FindTabbedBrowser(launcher_controller()->profile(), true);
       if (!browser || !IsBrowserRepresentedInBrowserList(browser))
         browser = items[0];
     }
   }
   DCHECK(browser);
   browser->window()->Show();
   browser->window()->Activate();
-  return kExistingWindowActivated;
+  return ash::SHELF_ACTION_WINDOW_ACTIVATED;
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
   if (!browser || !IsBrowserFromActiveUser(browser))
     return false;
 
   // v1 App popup windows with a valid app id have their own icon.
   if (browser->is_app() && browser->is_type_popup() &&
@@ skipping 21 matching lines @@
         !browser->window()->IsMinimized()) {
       continue;
     }
     if (!IsBrowserRepresentedInBrowserList(browser) &&
         !browser->is_type_tabbed())
       continue;
     active_browsers.push_back(browser);
   }
   return active_browsers;
 }