diff options
author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 15:22:20 +0000 |
---|---|---|
committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 15:22:20 +0000 |
commit | 9bf14a24e1de759fddfbbee8050d65ef2d95ef18 (patch) | |
tree | 24aa03d05b22be52366d8baf06dab96638ecf71b /chrome/browser/views/extensions | |
parent | e685fc4178818c026f1498461edb3f2bfeff5722 (diff) | |
download | chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.zip chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.tar.gz chromium_src-9bf14a24e1de759fddfbbee8050d65ef2d95ef18.tar.bz2 |
Revert 42091 - Refactor apprelated manifest properties so that they don't
include the name 'app'. I think these will be useful for normal
extensions, too.
Also extract an ExtensionExtent class out of Extension. I think
this will be useful for passing by value to the IO thread.
Review URL: http://codereview.chromium.org/1025006
TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/1120005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/extensions')
-rw-r--r-- | chrome/browser/views/extensions/extension_install_prompt.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/views/extensions/extension_install_prompt.cc b/chrome/browser/views/extensions/extension_install_prompt.cc index 7e45c67..482cb3c 100644 --- a/chrome/browser/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/views/extensions/extension_install_prompt.cc @@ -44,7 +44,7 @@ class InstallDialogContent : public views::View, public views::DialogDelegate { ExtensionInstallUI::PromptType type) : delegate_(delegate), icon_(NULL), warning_(NULL), create_shortcut_(NULL), type_(type) { - if (extension->GetFullLaunchURL().is_valid()) { + if (extension->IsApp()) { icon_size_ = kIconSizeApp; right_column_width_ = kRightColumnWidthApp; } else { @@ -69,8 +69,7 @@ class InstallDialogContent : public views::View, public views::DialogDelegate { heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); AddChildView(heading_); - if (type_ == ExtensionInstallUI::INSTALL_PROMPT && - extension->GetFullLaunchURL().is_valid()) { + if (type_ == ExtensionInstallUI::INSTALL_PROMPT && extension->IsApp()) { create_shortcut_ = new views::Checkbox( l10n_util::GetString(IDS_EXTENSION_PROMPT_CREATE_SHORTCUT)); create_shortcut_->SetChecked(true); |