diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:38:40 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:38:40 +0000 |
| commit | a807d3fceadd4838c346ba9d5b68798a0b4081d6 (patch) | |
| tree | 1c68747834fd1c2da3e522fab91ba43fda62d8b3 /chrome/browser/extensions/extension_install_ui.cc | |
| parent | 2ae892453109680699580853e78e89419bceb7a8 (diff) | |
| download | chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.zip chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.tar.gz chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.tar.bz2 | |
Revert 48042: it breaks unit-tests and UI tests on ChromeOS
Disabling app launcher and enabling apps by default on ChromeOS .
BUG=3218
TEST=Open the new tab, the new new tab should be shown. Any installed
app should be showing in there.
Review URL: http://codereview.chromium.org/2135011
TBR=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/2077020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_ui.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 552e231..c85b254 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -273,8 +273,13 @@ void ExtensionInstallUI::OnImageLoaded( switch (prompt_type_) { case INSTALL_PROMPT: { - // TODO(jcivelli): http://crbug.com/44771 We should not show an install - // dialog when installing an app from the gallery. + if (extension_->GetFullLaunchURL().is_valid()) { + // Special case extension apps to not show the install dialog. + // TODO(finnur): http://crbug.com/42443: Don't do this for all apps. + delegate_->InstallUIProceed(false); // |create_app_shortcut|. + return; + } + NotificationService* service = NotificationService::current(); service->Notify(NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG, Source<ExtensionInstallUI>(this), |