Skip to content

GitLab

T
tangled
Commit 305162ce authored by aa@chromium.org's avatar aa@chromium.org
Browse files
Options

Remove launch.container='window'. 

BUG=49241

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56934 0039d316-1c4b-4281-b951-d872f2087c98
parent 443d39bb
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 32 deletions
chrome/common/extensions/extension.cc
View file @ 305162ce
......@@ -669,8 +669,6 @@ bool Extension::LoadLaunchContainer(const DictionaryValue* manifest,
launch_container_ = LAUNCH_PANEL;
} else if (launch_container_string == values::kLaunchContainerTab) {
launch_container_ = LAUNCH_TAB;
} else if (launch_container_string == values::kLaunchContainerWindow) {
launch_container_ = LAUNCH_WINDOW;
} else {
*error = errors::kInvalidLaunchContainer;
return false;
......
chrome/common/extensions/extension_manifests_unittest.cc
View file @ 305162ce
......@@ -18,9 +18,9 @@
namespace errors = extension_manifest_errors;
class ManifestTest : public testing::Test {
class ExtensionManifestTest : public testing::Test {
public:
ManifestTest() : enable_apps_(true) {}
ExtensionManifestTest() : enable_apps_(true) {}
protected:
Extension* LoadExtension(const std::string& name,
......@@ -76,7 +76,7 @@ class ManifestTest : public testing::Test {
bool enable_apps_;
};
TEST_F(ManifestTest, AppsDisabledByDefault) {
TEST_F(ExtensionManifestTest, AppsDisabledByDefault) {
#if defined(OS_CHROMEOS)
// On ChromeOS, apps are enabled by default.
if (Extension::AppsAreEnabled())
......@@ -87,19 +87,19 @@ TEST_F(ManifestTest, AppsDisabledByDefault) {
LoadAndExpectError("launch_local_path.json", errors::kAppsNotEnabled);
}
TEST_F(ManifestTest, ValidApp) {
TEST_F(ExtensionManifestTest, ValidApp) {
scoped_ptr<Extension> extension(LoadAndExpectSuccess("valid_app.json"));
ASSERT_EQ(2u, extension->web_extent().patterns().size());
EXPECT_EQ("http://www.google.com/mail/*",
extension->web_extent().patterns()[0].GetAsString());
EXPECT_EQ("http://www.google.com/foobar/*",
extension->web_extent().patterns()[1].GetAsString());
EXPECT_EQ(Extension::LAUNCH_WINDOW, extension->launch_container());
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());
}
TEST_F(ManifestTest, AppWebUrls) {
TEST_F(ExtensionManifestTest, AppWebUrls) {
LoadAndExpectError("web_urls_wrong_type.json",
errors::kInvalidWebURLs);
LoadAndExpectError("web_urls_invalid_1.json",
......@@ -119,7 +119,7 @@ TEST_F(ManifestTest, AppWebUrls) {
extension->web_extent().patterns()[0].GetAsString());
}
TEST_F(ManifestTest, AppBrowseUrls) {
TEST_F(ExtensionManifestTest, AppBrowseUrls) {
LoadAndExpectError("browse_urls_wrong_type.json",
errors::kInvalidBrowseURLs);
LoadAndExpectError("browse_urls_invalid_1.json",
......@@ -143,15 +143,12 @@ TEST_F(ManifestTest, AppBrowseUrls) {
extension->browse_extent().patterns()[0].GetAsString());
}
TEST_F(ManifestTest, AppLaunchContainer) {
TEST_F(ExtensionManifestTest, AppLaunchContainer) {
scoped_ptr<Extension> extension;
extension.reset(LoadAndExpectSuccess("launch_tab.json"));
EXPECT_EQ(Extension::LAUNCH_TAB, extension->launch_container());
extension.reset(LoadAndExpectSuccess("launch_window.json"));
EXPECT_EQ(Extension::LAUNCH_WINDOW, extension->launch_container());
extension.reset(LoadAndExpectSuccess("launch_panel.json"));
EXPECT_EQ(Extension::LAUNCH_PANEL, extension->launch_container());
......@@ -167,6 +164,8 @@ TEST_F(ManifestTest, AppLaunchContainer) {
extension.reset(LoadAndExpectSuccess("launch_height.json"));
EXPECT_EQ(480, extension->launch_height());
LoadAndExpectError("launch_window.json",
errors::kInvalidLaunchContainer);
LoadAndExpectError("launch_container_invalid_type.json",
errors::kInvalidLaunchContainer);
LoadAndExpectError("launch_container_invalid_value.json",
......@@ -185,7 +184,7 @@ TEST_F(ManifestTest, AppLaunchContainer) {
errors::kInvalidLaunchHeight);
}
TEST_F(ManifestTest, AppLaunchURL) {
TEST_F(ExtensionManifestTest, AppLaunchURL) {
LoadAndExpectError("launch_path_and_url.json",
errors::kLaunchPathAndURLAreExclusive);
LoadAndExpectError("launch_path_invalid_type.json",
......@@ -208,7 +207,7 @@ TEST_F(ManifestTest, AppLaunchURL) {
extension->GetFullLaunchURL());
}
TEST_F(ManifestTest, Override) {
TEST_F(ExtensionManifestTest, Override) {
LoadAndExpectError("override_newtab_and_history.json",
errors::kMultipleOverrides);
LoadAndExpectError("override_invalid_page.json",
......@@ -225,12 +224,12 @@ TEST_F(ManifestTest, Override) {
extension->GetChromeURLOverrides().find("history")->second.spec());
}
TEST_F(ManifestTest, ChromeURLPermissionInvalid) {
TEST_F(ExtensionManifestTest, ChromeURLPermissionInvalid) {
LoadAndExpectError("permission_chrome_url_invalid.json",
errors::kInvalidPermissionScheme);
}
TEST_F(ManifestTest, ChromeResourcesPermissionValidOnlyForComponents) {
TEST_F(ExtensionManifestTest, ChromeResourcesPermissionValidOnlyForComponents) {
LoadAndExpectError("permission_chrome_resources_url.json",
errors::kInvalidPermissionScheme);
std::string error;
......@@ -242,12 +241,12 @@ TEST_F(ManifestTest, ChromeResourcesPermissionValidOnlyForComponents) {
EXPECT_EQ("", error);
}
TEST_F(ManifestTest, ChromeURLContentScriptInvalid) {
TEST_F(ExtensionManifestTest, ChromeURLContentScriptInvalid) {
LoadAndExpectError("content_script_chrome_url_invalid.json",
errors::kInvalidMatch);
}
TEST_F(ManifestTest, DevToolsExtensions) {
TEST_F(ExtensionManifestTest, DevToolsExtensions) {
LoadAndExpectError("devtools_extension_no_permissions.json",
errors::kDevToolsExperimental);
LoadAndExpectError("devtools_extension_url_invalid_type.json",
......@@ -264,7 +263,7 @@ TEST_F(ManifestTest, DevToolsExtensions) {
*CommandLine::ForCurrentProcess() = old_command_line;
}
TEST_F(ManifestTest, DisallowHybridApps) {
TEST_F(ExtensionManifestTest, DisallowHybridApps) {
LoadAndExpectError("disallow_hybrid_1.json",
errors::kHostedAppsCannotIncludeExtensionFeatures);
LoadAndExpectError("disallow_hybrid_2.json",
......
chrome/test/data/extensions/manifest_tests/browse_urls_default.json
View file @ 305162ce
......@@ -3,7 +3,6 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
}
},
......
chrome/test/data/extensions/manifest_tests/browse_urls_valid.json
View file @ 305162ce
......@@ -3,7 +3,6 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
},
"browse_urls": [
......
chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json
View file @ 305162ce
......@@ -7,7 +7,6 @@
"http://www.google.com/foobar/"
],
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
}
},
......
chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json
View file @ 305162ce
......@@ -7,7 +7,6 @@
"http://www.google.com/foobar/"
],
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
}
},
......
chrome/test/data/extensions/manifest_tests/launch_fullscreen.json
View file @ 305162ce
......@@ -3,7 +3,6 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"fullscreen": true,
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/launch_fullscreen_invalid.json
View file @ 305162ce
......@@ -3,7 +3,6 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"fullscreen": "true",
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/launch_height.json
View file @ 305162ce
......@@ -3,7 +3,7 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"container": "panel",
"height": 480,
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/launch_height_negative.json
View file @ 305162ce
......@@ -3,7 +3,7 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"container": "panel",
"height": -1,
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/launch_width.json
View file @ 305162ce
......@@ -3,7 +3,7 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"container": "panel",
"width": 640,
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/launch_width_negative.json
View file @ 305162ce
......@@ -3,7 +3,7 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"container": "panel",
"width": -1,
"local_path": "bar.html"
}
......
chrome/test/data/extensions/manifest_tests/valid_app.json
View file @ 305162ce
......@@ -7,7 +7,6 @@
"http://www.google.com/foobar/"
],
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
}
},
......
chrome/test/data/extensions/manifest_tests/web_urls_default.json
View file @ 305162ce
......@@ -3,7 +3,6 @@
"version": "1",
"app": {
"launch": {
"container": "window",
"web_url": "http://www.google.com/mail/"
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment