Move LaunchType out of ExtensionPrefs.

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

 // Copyright 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/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 683 matching lines @@
   // Create a temporary application launcher item and use it to see if there are
   // running instances.
   scoped_ptr<AppShortcutLauncherItemController> app_controller(
       new AppShortcutLauncherItemController(app_id, this));
   if (!app_controller->GetRunningApplications().empty())
     app_controller->Activate(source);
   else
     LaunchApp(app_id, source, event_flags);
 }
 
-extensions::ExtensionPrefs::LaunchType
-    ChromeLauncherController::GetLaunchType(ash::LauncherID id) {
+extensions::LaunchType ChromeLauncherController::GetLaunchType(
+    ash::LauncherID id) {
   DCHECK(HasItemController(id));
 
   const Extension* extension = GetExtensionForAppID(
       id_to_item_controller_map_[id]->app_id());
 
   // An extension can be unloaded/updated/unavailable at any time.
   if (!extension)
-    return extensions::ExtensionPrefs::LAUNCH_TYPE_DEFAULT;
+    return extensions::LAUNCH_TYPE_DEFAULT;
 
-  return profile_->GetExtensionService()->extension_prefs()->GetLaunchType(
+  return extensions::GetLaunchType(
+      profile_->GetExtensionService()->extension_prefs(),
       extension);
 }
 
 ash::LauncherID ChromeLauncherController::GetLauncherIDForAppID(
     const std::string& app_id) {
   for (IDToItemControllerMap::const_iterator i =
            id_to_item_controller_map_.begin();
        i != id_to_item_controller_map_.end(); ++i) {
     if (i->second->type() == LauncherItemController::TYPE_APP_PANEL)
       continue;  // Don't include panels
@@ skipping 75 matching lines @@
 
 void ChromeLauncherController::PinAppWithID(const std::string& app_id) {
   if (CanPin())
     DoPinAppWithID(app_id);
   else
     NOTREACHED();
 }
 
 void ChromeLauncherController::SetLaunchType(
     ash::LauncherID id,
-    extensions::ExtensionPrefs::LaunchType launch_type) {
+    extensions::LaunchType launch_type) {
   if (!HasItemController(id))
     return;
 
-  profile_->GetExtensionService()->extension_prefs()->SetLaunchType(
-      id_to_item_controller_map_[id]->app_id(), launch_type);
+  extensions::SetLaunchType(profile_->GetExtensionService()->extension_prefs(),
+                            id_to_item_controller_map_[id]->app_id(),
+                            launch_type);
 }
 
 void ChromeLauncherController::UnpinAppWithID(const std::string& app_id) {
   if (CanPin())
     DoUnpinAppWithID(app_id);
   else
     NOTREACHED();
 }
 
 bool ChromeLauncherController::IsLoggedInAsGuest() {
@@ skipping 1184 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }