Remove PerBrowser launcher, reland step 1 of 2

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

 // Copyright (c) 2012 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/launcher_item_controller.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h"
 #include "chrome/common/extensions/extension.h"
 
 LauncherItemController::LauncherItemController(
     Type type,
     const std::string& app_id,
     ChromeLauncherController* launcher_controller)
     : type_(type),
       app_id_(app_id),
       launcher_id_(0),
       launcher_controller_(launcher_controller),
@@ skipping 25 matching lines @@
     case LauncherItemController::TYPE_APP:
       return ash::TYPE_PLATFORM_APP;
     case LauncherItemController::TYPE_APP_PANEL:
       return ash::TYPE_APP_PANEL;
     case LauncherItemController::TYPE_TABBED:
       return ash::TYPE_TABBED;
   }
   NOTREACHED();
   return ash::TYPE_APP_SHORTCUT;
 }