Move LaunchType out of ExtensionPrefs.

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 17 matching lines @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 1713 matching lines @@
           "is_component_extension",
           (*ext)->location() == extensions::Manifest::COMPONENT);
 
       // Convert the launch_type integer into a more descriptive string.
       int launch_type;
       const char* kLaunchType = "launch_type";
       if (!app_info->GetInteger(kLaunchType, &launch_type)) {
         NOTREACHED() << "Can't get integer from key " << kLaunchType;
         continue;
       }
-      if (launch_type == extensions::ExtensionPrefs::LAUNCH_TYPE_PINNED) {
+      if (launch_type == extensions::LAUNCH_TYPE_PINNED) {
         app_info->SetString(kLaunchType, "pinned");
-      } else if (launch_type ==
-                 extensions::ExtensionPrefs::LAUNCH_TYPE_REGULAR) {
+      } else if (launch_type == extensions::LAUNCH_TYPE_REGULAR) {
         app_info->SetString(kLaunchType, "regular");
-      } else if (launch_type ==
-                 extensions::ExtensionPrefs::LAUNCH_TYPE_FULLSCREEN) {
+      } else if (launch_type == extensions::LAUNCH_TYPE_FULLSCREEN) {
         app_info->SetString(kLaunchType, "fullscreen");
-      } else if (launch_type ==
-                 extensions::ExtensionPrefs::LAUNCH_TYPE_WINDOW) {
+      } else if (launch_type == extensions::LAUNCH_TYPE_WINDOW) {
         app_info->SetString(kLaunchType, "window");
       } else {
         app_info->SetString(kLaunchType, "unknown");
       }
 
       apps_list->push_back(app_info);
     }
   }
   return apps_list;
 }
@@ skipping 856 matching lines @@
       if (automation_.get()) {
         AutomationJSONReply(automation_.get(), reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }