diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-15 21:06:20 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-15 21:06:20 +0000 |
| commit | 80d8df89c6cda97db4eebe36f10b135346c02a44 (patch) | |
| tree | 12a188093e46f354c816e54498ff774833c06b5f /chrome/browser | |
| parent | 426eb3a4fcb30d7f70148b138ce0a7d38f3cb48c (diff) | |
| download | chromium_src-80d8df89c6cda97db4eebe36f10b135346c02a44.zip chromium_src-80d8df89c6cda97db4eebe36f10b135346c02a44.tar.gz chromium_src-80d8df89c6cda97db4eebe36f10b135346c02a44.tar.bz2 | |
Close NTP when launching an app (fix regression)
BUG=51157
TEST=none
Review URL: http://codereview.chromium.org/3159017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/dom_ui/app_launcher_handler.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc index 0f76bfb..8fd40e7 100644 --- a/chrome/browser/dom_ui/app_launcher_handler.cc +++ b/chrome/browser/dom_ui/app_launcher_handler.cc @@ -166,11 +166,6 @@ void AppLauncherHandler::HandleLaunchApp(const Value* value) { DCHECK(extension); Profile* profile = extensions_service_->profile(); - if (launch_container.empty()) { - AnimateAppIcon(extension, rect); - Browser::OpenApplication(profile, extension_id); - return; - } Extension::LaunchContainer container = extension->launch_container(); if (launch_container == "tab") @@ -179,7 +174,7 @@ void AppLauncherHandler::HandleLaunchApp(const Value* value) { container = Extension::LAUNCH_PANEL; else if (launch_container == "window") container = Extension::LAUNCH_WINDOW; - else + else if (!launch_container.empty()) NOTREACHED() << "Unexpected launch container: " << launch_container << "."; // To give a more "launchy" experience when using the NTP launcher, we close |