Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2384)

Unified Diff: chrome/browser/ui/app_list/search/webstore/webstore_result.cc

Issue 934683002: Remove ability to launch ephemeral apps from the app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove resources Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/search/webstore/webstore_result.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/webstore/webstore_result.cc
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
index 8c818929f3eb3c2d5175115badcb9141257a2832..3fc90c8eafddc28c8c9b0fc306518e1610184fa0 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
@@ -35,8 +35,6 @@
namespace {
-const int kLaunchEphemeralAppAction = 1;
-
// BadgedImageSource adds a webstore badge to a webstore app icon.
class BadgedIconSource : public gfx::CanvasImageSource {
public:
@@ -125,7 +123,7 @@ void WebstoreResult::InvokeAction(int action_index, int event_flags) {
return;
}
- StartInstall(action_index == kLaunchEphemeralAppAction);
+ StartInstall();
}
scoped_ptr<SearchResult> WebstoreResult::Duplicate() const {
@@ -164,23 +162,9 @@ void WebstoreResult::UpdateActions() {
extensions::util::IsExtensionInstalledPermanently(app_id_, profile_);
if (!is_otr && !is_installed && !is_installing()) {
- if (EphemeralAppLauncher::IsFeatureEnabled()) {
- actions.push_back(Action(
- l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_INSTALL),
- l10n_util::GetStringUTF16(
- IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE)));
- if ((item_type_ == extensions::Manifest::TYPE_PLATFORM_APP ||
- item_type_ == extensions::Manifest::TYPE_HOSTED_APP) &&
- !is_paid_) {
- actions.push_back(Action(
- l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_LAUNCH),
- l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_LAUNCH_APP_TOOLTIP)));
- }
- } else {
- actions.push_back(Action(
- l10n_util::GetStringUTF16(IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE),
- base::string16()));
- }
+ actions.push_back(Action(
+ l10n_util::GetStringUTF16(IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE),
+ base::string16()));
}
SetActions(actions);
@@ -209,22 +193,10 @@ void WebstoreResult::OnIconLoaded() {
SetIcon(icon_);
}
-void WebstoreResult::StartInstall(bool launch_ephemeral_app) {
+void WebstoreResult::StartInstall() {
SetPercentDownloaded(0);
SetIsInstalling(true);
- if (launch_ephemeral_app) {
- scoped_refptr<EphemeralAppLauncher> installer =
- EphemeralAppLauncher::CreateForLauncher(
- app_id_,
- profile_,
- controller_->GetAppListWindow(),
- base::Bind(&WebstoreResult::LaunchCallback,
- weak_factory_.GetWeakPtr()));
- installer->Start();
- return;
- }
-
scoped_refptr<WebstoreInstaller> installer =
new WebstoreInstaller(
app_id_,
« no previous file with comments | « chrome/browser/ui/app_list/search/webstore/webstore_result.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698