Move LaunchContainer enum to extension_constants.h.

chrome/common/extensions/manifest_handlers/app_launch_info.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/common/extensions/manifest_handlers/app_launch_info.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 41 matching lines @@
 
 const AppLaunchInfo& GetAppLaunchInfo(const Extension* extension) {
   AppLaunchInfo* info = static_cast<AppLaunchInfo*>(
       extension->GetManifestData(keys::kLaunch));
   return info ? *info : g_empty_app_launch_info.Get();
 }
 
 }  // namespace
 
 AppLaunchInfo::AppLaunchInfo()
-    : launch_container_(LAUNCH_TAB),
+    : launch_container_(LAUNCH_CONTAINER_TAB),
       launch_width_(0),
       launch_height_(0) {
 }
 
 AppLaunchInfo::~AppLaunchInfo() {
 }
 
 // static
 const std::string& AppLaunchInfo::GetLaunchLocalPath(
     const Extension* extension) {
@@ skipping 158 matching lines @@
                                   &tmp_launcher_container))
     return true;
 
   std::string launch_container_string;
   if (!tmp_launcher_container->GetAsString(&launch_container_string)) {
     *error = ASCIIToUTF16(errors::kInvalidLaunchContainer);
     return false;
   }
 
   if (launch_container_string == values::kLaunchContainerPanel) {
-    launch_container_ = LAUNCH_PANEL;
+    launch_container_ = LAUNCH_CONTAINER_PANEL;
   } else if (launch_container_string == values::kLaunchContainerTab) {
-    launch_container_ = LAUNCH_TAB;
+    launch_container_ = LAUNCH_CONTAINER_TAB;
   } else {
     *error = ASCIIToUTF16(errors::kInvalidLaunchContainer);
     return false;
   }
 
-  bool can_specify_initial_size = launch_container_ == LAUNCH_PANEL;
+  bool can_specify_initial_size = launch_container_ == LAUNCH_CONTAINER_PANEL;
 
   // Validate the container width if present.
   if (!ReadLaunchDimension(extension->manifest(),
                            keys::kLaunchWidth,
                            &launch_width_,
                            can_specify_initial_size,
                            error)) {
     return false;
   }
 
@@ skipping 56 matching lines @@
     keys::kLaunchLocalPath,
     keys::kLaunchWebURL,
     keys::kLaunchContainer,
     keys::kLaunchHeight,
     keys::kLaunchWidth
   };
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions