Adding ChromeLauncherController interface.

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_model.h"
+#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_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"
@@ skipping 115 matching lines @@
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end(); ++it) {
     if (launcher_controller()->IsBrowserFromActiveUser(*it))
       return true;
   }
   return false;
 }
 
 bool BrowserShortcutLauncherItemController::IsVisible() const {
   Browser* last_browser =
-      chrome::FindTabbedBrowser(launcher_controller()->profile(), true);
+      chrome::FindTabbedBrowser(launcher_controller()->GetProfile(), true);
 
   if (!last_browser) {
     return false;
   }
 
   aura::Window* window = last_browser->window()->GetNativeWindow();
   return ash::wm::IsActiveWindow(window);
 }
 
 void BrowserShortcutLauncherItemController::Launch(ash::LaunchSource source,
                                                    int event_flags) {
 }
 
 ash::ShelfItemDelegate::PerformedAction
 BrowserShortcutLauncherItemController::Activate(ash::LaunchSource source) {
   Browser* last_browser =
-      chrome::FindTabbedBrowser(launcher_controller()->profile(), true);
+      chrome::FindTabbedBrowser(launcher_controller()->GetProfile(), true);
 
   if (!last_browser) {
-    chrome::NewEmptyWindow(launcher_controller()->profile());
+    chrome::NewEmptyWindow(launcher_controller()->GetProfile());
     return kNewWindowCreated;
   }
 
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
       last_browser->window(), GetApplicationList(0).size() == 2);
 }
 
 void BrowserShortcutLauncherItemController::Close() {
   for (auto* browser : GetListOfActiveBrowsers())
     browser->window()->Close();
@@ 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;
 }
 
 ash::ShelfItemDelegate::PerformedAction
 BrowserShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
   if (event.flags() & ui::EF_CONTROL_DOWN) {
-    chrome::NewEmptyWindow(launcher_controller()->profile());
+    chrome::NewEmptyWindow(launcher_controller()->GetProfile());
     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);
@@ skipping 54 matching lines @@
   // 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());
+    chrome::NewEmptyWindow(launcher_controller()->GetProfile());
     return kNewWindowCreated;
   }
   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;
     }
     browser = items[0];
   } else {
     // If there is more then 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);
+          chrome::FindTabbedBrowser(launcher_controller()->GetProfile(), true);
       if (!browser ||
           !IsBrowserRepresentedInBrowserList(browser))
         browser = items[0];
     }
   }
   DCHECK(browser);
   browser->window()->Show();
   browser->window()->Activate();
   return kExistingWindowActivated;
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
   if (!browser || !launcher_controller()->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() &&
-      launcher_controller()->GetShelfIDForAppID(
+      ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(
           web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
     return false;
 
   // Settings browsers have their own icon.
   if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }
@@ skipping 10 matching lines @@
         !browser->window()->IsMinimized()) {
       continue;
     }
     if (!IsBrowserRepresentedInBrowserList(browser) &&
         !browser->is_type_tabbed())
       continue;
     active_browsers.push_back(browser);
   }
   return active_browsers;
 }