Adding ChromeLauncherController interface.

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

Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
index 82276a6d843319c392dc9360a3553f8409fec018..bfdc1e962a14acecaad7d3d859928e9f15bf20a8 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -7,6 +7,7 @@
 #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"
@@ -142,7 +143,7 @@ bool BrowserShortcutLauncherItemController::IsOpen() const {
 
 bool BrowserShortcutLauncherItemController::IsVisible() const {
   Browser* last_browser =
-      chrome::FindTabbedBrowser(launcher_controller()->profile(), true);
+      chrome::FindTabbedBrowser(launcher_controller()->GetProfile(), true);
 
   if (!last_browser) {
     return false;
@@ -159,10 +160,10 @@ void BrowserShortcutLauncherItemController::Launch(ash::LaunchSource source,
 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;
   }
 
@@ -219,7 +220,7 @@ BrowserShortcutLauncherItemController::GetApplicationList(int event_flags) {
 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;
   }
 
@@ -294,7 +295,7 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
   }
   // 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());
@@ -317,7 +318,7 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
       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];
@@ -338,7 +339,7 @@ bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
   // 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;