Move LaunchContainer enum to extension_constants.h.

chrome/browser/extensions/launch_util.cc

Index: chrome/browser/extensions/launch_util.cc
diff --git a/chrome/browser/extensions/launch_util.cc b/chrome/browser/extensions/launch_util.cc
index 826f0df5d8b0eb33768e45769b9ee4def4a2d5b0..56c749e79de6baff4baea6783ab93661ccfdd0d3 100644
--- a/chrome/browser/extensions/launch_util.cc
+++ b/chrome/browser/extensions/launch_util.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 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.
 
@@ -81,11 +81,11 @@ LaunchContainer GetLaunchContainer(const ExtensionPrefs* prefs,
 
   LaunchContainer result = kInvalidLaunchContainer;
 
-  if (manifest_launch_container == LAUNCH_PANEL) {
+  if (manifest_launch_container == LAUNCH_CONTAINER_PANEL) {
     // Apps with app.launch.container = 'panel' should always respect the
     // manifest setting.
     result = manifest_launch_container;
-  } else if (manifest_launch_container == LAUNCH_TAB) {
+  } else if (manifest_launch_container == LAUNCH_CONTAINER_TAB) {
     // Look for prefs that indicate the user's choice of launch container. The
     // app's menu on the NTP provides a UI to set this preference.
     LaunchType prefs_launch_type = GetLaunchType(prefs, extension);
@@ -93,7 +93,7 @@ LaunchContainer GetLaunchContainer(const ExtensionPrefs* prefs,
     if (prefs_launch_type == LAUNCH_TYPE_WINDOW) {
       // If the pref is set to launch a window (or no pref is set, and
       // window opening is the default), make the container a window.
-      result = LAUNCH_WINDOW;
+      result = LAUNCH_CONTAINER_WINDOW;
 #if defined(USE_ASH)
     } else if (prefs_launch_type == LAUNCH_TYPE_FULLSCREEN &&
                chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
@@ -101,24 +101,24 @@ LaunchContainer GetLaunchContainer(const ExtensionPrefs* prefs,
       // For desktop chrome AURA on all platforms we should open the
       // application in full screen mode in the current tab, on the same
       // lines as non AURA chrome.
-      result = LAUNCH_WINDOW;
+      result = LAUNCH_CONTAINER_WINDOW;
 #endif
     } else {
       // All other launch types (tab, pinned, fullscreen) are
       // implemented as tabs in a window.
-      result = LAUNCH_TAB;
+      result = LAUNCH_CONTAINER_TAB;
     }
   } else {
     // If a new value for app.launch.container is added, logic for it should be
-    // added here.  LAUNCH_WINDOW is not present because there is no way to set
-    // it in a manifest.
+    // added here. LAUNCH_CONTAINER_WINDOW is not present because there is no
+    // way to set it in a manifest.
     NOTREACHED() << manifest_launch_container;
   }
 
   // All paths should set |result|.
   if (result == kInvalidLaunchContainer) {
     DLOG(FATAL) << "Failed to set a launch container.";
-    result = LAUNCH_TAB;
+    result = LAUNCH_CONTAINER_TAB;
   }
 
   return result;
@@ -129,7 +129,7 @@ bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs,
   int value = -1;
   LaunchContainer manifest_launch_container =
       AppLaunchInfo::GetLaunchContainer(extension);
-  return manifest_launch_container == LAUNCH_TAB &&
+  return manifest_launch_container == LAUNCH_CONTAINER_TAB &&
       prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
 }