Move LaunchType out of ExtensionPrefs.

chrome/browser/ui/app_list/app_context_menu.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/app_list/app_context_menu.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
+#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_context_menu_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "content/public/common/context_menu_params.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 212 matching lines @@
   } else if (command_id == TOGGLE_PIN && controller_->GetPinnable() ==
       AppListControllerDelegate::PIN_EDITABLE) {
     if (controller_->IsAppPinned(app_id_))
       controller_->UnpinApp(app_id_);
     else
       controller_->PinApp(app_id_);
   } else if (command_id == CREATE_SHORTCUTS) {
     controller_->DoCreateShortcutsFlow(profile_, app_id_);
   } else if (command_id >= LAUNCH_TYPE_START &&
              command_id < LAUNCH_TYPE_LAST) {
-    extensions::ExtensionPrefs::LaunchType launch_type =
-        static_cast<extensions::ExtensionPrefs::LaunchType>(
-            command_id - LAUNCH_TYPE_START);
+    extensions::LaunchType launch_type =
+        static_cast<extensions::LaunchType>(command_id - LAUNCH_TYPE_START);
     // Streamlined hosted apps can only toggle between LAUNCH_WINDOW and
     // LAUNCH_REGULAR.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableStreamlinedHostedApps)) {
       launch_type = controller_->GetExtensionLaunchType(profile_, app_id_) ==
-                            extensions::ExtensionPrefs::LAUNCH_TYPE_REGULAR
-                        ? extensions::ExtensionPrefs::LAUNCH_TYPE_WINDOW
-                        : extensions::ExtensionPrefs::LAUNCH_TYPE_REGULAR;
+                            extensions::LAUNCH_TYPE_REGULAR

[Yoyo Zhou, 2013/12/05 02:43:50]

nit: this indent looks funny

[Daniel Erat, 2013/12/05 03:24:35]

agreed; i'll clean this up (don't like the leading '?' and ':' either)

+                        ? extensions::LAUNCH_TYPE_WINDOW
+                        : extensions::LAUNCH_TYPE_REGULAR;
     }
     controller_->SetExtensionLaunchType(profile_,
                                         app_id_,
                                         launch_type);
   } else if (command_id == OPTIONS) {
     controller_->ShowOptionsPage(profile_, app_id_);
   } else if (command_id == UNINSTALL) {
     controller_->UninstallApp(profile_, app_id_);
   } else if (command_id == DETAILS) {
     controller_->ShowAppInWebStore(profile_, app_id_, is_search_result_);
   } else if (command_id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST &&
              command_id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) {
     extension_menu_items_->ExecuteCommand(command_id, NULL,
                                           content::ContextMenuParams());
   } else if (command_id == MENU_NEW_WINDOW) {
     controller_->CreateNewWindow(profile_, false);
   } else if (command_id == MENU_NEW_INCOGNITO_WINDOW) {
     controller_->CreateNewWindow(profile_, true);
   }
 }
 
 }  // namespace app_list