Remove PerBrowser launcher

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index dafc18dc9fe18e1acc0827973cda006037055acb..6ee721e18e9a668550bfaf0b90b1b802f097303c 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -88,11 +88,6 @@ class ChromeLauncherController
   // Initializes this ChromeLauncherController.
   virtual void Init() = 0;
 
-  // Returns the new per application interface of the given launcher. If it is
-  // a per browser (old) controller, it will return NULL;
-  // TODO(skuhne): Remove when we rip out the old launcher.
-  virtual ChromeLauncherControllerPerApp* GetPerAppInterface() = 0;
-
   // Creates an instance.
   static ChromeLauncherController* CreateInstance(Profile* profile,
                                                   ash::LauncherModel* model);
@@ -100,12 +95,6 @@ class ChromeLauncherController
   // Returns the single ChromeLauncherController instance.
   static ChromeLauncherController* instance() { return instance_; }
 
-  // Creates a new tabbed item on the launcher for |controller|.
-  virtual ash::LauncherID CreateTabbedLauncherItem(
-      LauncherItemController* controller,
-      IncognitoState is_incognito,
-      ash::LauncherItemStatus status) = 0;
-
   // Creates a new app item on the launcher for |controller|.
   virtual ash::LauncherID CreateAppLauncherItem(
       LauncherItemController* controller,
@@ -276,7 +265,6 @@ class ChromeLauncherController
   virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE = 0;
   virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE = 0;
   virtual bool ShouldShowTooltip(const ash::LauncherItem& item) OVERRIDE = 0;
-  virtual bool IsPerAppLauncher() OVERRIDE;
 
   // extensions::AppIconLoader overrides:
   virtual void SetAppImage(const std::string& app_id,
@@ -286,8 +274,6 @@ class ChromeLauncherController
   friend class LauncherItemControllerPerAppTest;
   friend class LauncherPlatformAppBrowserTest;
   friend class LauncherAppBrowserTest;
-  // TODO(skuhne): Remove these when the old launcher get removed.
-  friend class LauncherPlatformPerAppAppBrowserTest;
   friend class LauncherPerAppAppBrowserTest;
 
   // Creates a new app shortcut item and controller on the launcher at |index|.