Remove full-screen launch option app.launch.fullscreen

BUG=42447
TEST=Load an extension with app.launch.fullscreen, saw that it had no effect.

Review URL: http://codereview.chromium.org/3275003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57855 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 34 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 1964598..9c8a428 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -726,20 +726,6 @@ bool Extension::LoadLaunchContainer(const DictionaryValue* manifest,
   return true;
 }
 
-bool Extension::LoadLaunchFullscreen(const DictionaryValue* manifest,
-                                    std::string* error) {
-  Value* temp = NULL;
-  if (!manifest->Get(keys::kLaunchFullscreen, &temp))
-    return true;
-
-  if (!temp->GetAsBoolean(&launch_fullscreen_)) {
-    *error = errors::kInvalidLaunchFullscreen;
-    return false;
-  }
-
-  return true;
-}
-
 bool Extension::EnsureNotHybridApp(const DictionaryValue* manifest,
                                    std::string* error) {
   if (web_extent().is_empty())
@@ -762,7 +748,6 @@ Extension::Extension(const FilePath& path)
       is_theme_(false),
       is_app_(false),
       launch_container_(LAUNCH_TAB),
-      launch_fullscreen_(false),
       launch_width_(0),
       launch_height_(0),
       background_page_ready_(false),
@@ -1414,8 +1399,7 @@ bool Extension::InitFromValue(const DictionaryValue& source, bool require_key,
                   errors::kInvalidWebURLs, errors::kInvalidWebURL, error) ||
       !EnsureNotHybridApp(manifest_value_.get(), error) ||
       !LoadLaunchURL(manifest_value_.get(), error) ||
-      !LoadLaunchContainer(manifest_value_.get(), error) ||
-      !LoadLaunchFullscreen(manifest_value_.get(), error)) {
+      !LoadLaunchContainer(manifest_value_.get(), error)) {
     return false;
   }
 
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 3d20a59..9f2dc9b 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -362,7 +362,6 @@ class Extension {
     launch_web_url_ = launch_web_url;
   }
   LaunchContainer launch_container() const { return launch_container_; }
-  bool launch_fullscreen() const { return launch_fullscreen_; }
   int launch_width() const { return launch_width_; }
   int launch_height() const { return launch_height_; }
 
@@ -430,8 +429,6 @@ class Extension {
                   ExtensionExtent* extent, const char* list_error,
                   const char* value_error, std::string* error);
   bool LoadLaunchContainer(const DictionaryValue* manifest, std::string* error);
-  bool LoadLaunchFullscreen(const DictionaryValue* manifest,
-                            std::string* error);
   bool LoadLaunchURL(const DictionaryValue* manifest, std::string* error);
   bool EnsureNotHybridApp(const DictionaryValue* manifest, std::string* error);
 
@@ -572,9 +569,6 @@ class Extension {
   // The type of container to launch into.
   LaunchContainer launch_container_;
 
-  // Launch full screen by default.
-  bool launch_fullscreen_;
-
   // The default size of the container when launching. Only respected for
   // containers like panels and windows.
   int launch_width_;
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 0640afd..2e9085b 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -24,7 +24,6 @@ const char* kIncludeGlobs = "include_globs";
 const char* kJs = "js";
 const char* kLaunch = "app.launch";
 const char* kLaunchContainer = "app.launch.container";
-const char* kLaunchFullscreen = "app.launch.fullscreen";
 const char* kLaunchHeight = "app.launch.height";
 const char* kLaunchLocalPath = "app.launch.local_path";
 const char* kLaunchWebURL = "app.launch.web_url";
@@ -134,8 +133,6 @@ const char* kInvalidKey =
     "Value 'key' is missing or invalid.";
 const char* kInvalidLaunchContainer =
     "Invalid value for 'app.launch.container'.";
-const char* kInvalidLaunchFullscreen =
-    "Invalid value for 'app.launch.fullscreen'.";
 const char* kInvalidLaunchHeight =
     "Invalid value for 'app.launch.height'.";
 const char* kInvalidLaunchHeightContainer =
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 9bd5e1e..97ac7f8 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -27,7 +27,6 @@ namespace extension_manifest_keys {
   extern const char* kJs;
   extern const char* kLaunch;
   extern const char* kLaunchContainer;
-  extern const char* kLaunchFullscreen;
   extern const char* kLaunchHeight;
   extern const char* kLaunchLocalPath;
   extern const char* kLaunchWebURL;
@@ -110,7 +109,6 @@ namespace extension_manifest_errors {
   extern const char* kInvalidJsList;
   extern const char* kInvalidKey;
   extern const char* kInvalidLaunchContainer;
-  extern const char* kInvalidLaunchFullscreen;
   extern const char* kInvalidLaunchHeight;
   extern const char* kInvalidLaunchHeightContainer;
   extern const char* kInvalidLaunchLocalPath;
diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
index e73fdf3..5593b72 100644
--- a/chrome/common/extensions/extension_manifests_unittest.cc
+++ b/chrome/common/extensions/extension_manifests_unittest.cc
@@ -138,7 +138,6 @@ TEST_F(ExtensionManifestTest, ValidApp) {
   EXPECT_EQ("http://www.google.com/foobar/*",
             extension->web_extent().patterns()[1].GetAsString());
   EXPECT_EQ(Extension::LAUNCH_TAB, extension->launch_container());
-  EXPECT_EQ(false, extension->launch_fullscreen());
   EXPECT_EQ("http://www.google.com/mail/", extension->launch_web_url());
 }
 
@@ -174,9 +173,6 @@ TEST_F(ExtensionManifestTest, AppLaunchContainer) {
   extension.reset(LoadAndExpectSuccess("launch_default.json"));
   EXPECT_EQ(Extension::LAUNCH_TAB, extension->launch_container());
 
-  extension.reset(LoadAndExpectSuccess("launch_fullscreen.json"));
-  EXPECT_EQ(true, extension->launch_fullscreen());
-
   extension.reset(LoadAndExpectSuccess("launch_width.json"));
   EXPECT_EQ(640, extension->launch_width());
 
@@ -191,8 +187,6 @@ TEST_F(ExtensionManifestTest, AppLaunchContainer) {
                      errors::kInvalidLaunchContainer);
   LoadAndExpectError("launch_container_without_launch_url.json",
                      errors::kLaunchURLRequired);
-  LoadAndExpectError("launch_fullscreen_invalid.json",
-                     errors::kInvalidLaunchFullscreen);
   LoadAndExpectError("launch_width_invalid.json",
                      errors::kInvalidLaunchWidthContainer);
   LoadAndExpectError("launch_width_negative.json",