summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_unittest.cc
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 04:45:50 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 04:45:50 +0000
commit28375ae7d27179af48386d37e78ca47a2563e0d0 (patch)
treeeeda16c75ff2651afe1cc1738f19226e9cd7ec96 /chrome/browser/shell_integration_unittest.cc
parent65b6cf331fd6bebe125635cffd01b595f58638c0 (diff)
downloadchromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.zip
chromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.tar.gz
chromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.tar.bz2
Implement launch disposition for extension-apps.
This change adds an --app-id command switch that signifies that the extension-app with the given id should be launched according to its configuration. It also adds parsing for app.window_type in the manifest and the behavior that when installed and a desktop shortcut is created, the --app-id switch is used rather than the --app switch. BUG=32361 Review URL: http://codereview.chromium.org/573016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_unittest.cc')
-rw-r--r--chrome/browser/shell_integration_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index e409013..cfbaed9 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -167,6 +167,7 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
ShellIntegration::GetDesktopFileContents(
test_cases[i].template_contents,
GURL(test_cases[i].url),
+ EmptyString16(),
ASCIIToUTF16(test_cases[i].title),
test_cases[i].icon_name));
}