chrome/browser/extensions/crx_installer.cc - Issue 634313004: Display dialog when app install succeeds / fails on Athena

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/crx_installer.cc

Issue 634313004: Display dialog when app install succeeds / fails on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/extensions/api/webstore_private/webstore_private_apitest.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/crx_installer.cc

diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc

index bae36d939c9bc8ca58e25d4e04401ee965875147..9402445f083154d4af5b31ce3454ddd0f8558e32 100644

--- a/chrome/browser/extensions/crx_installer.cc

+++ b/chrome/browser/extensions/crx_installer.cc

@@ -23,10 +23,8 @@

#include "base/version.h"

#include "chrome/browser/extensions/convert_user_script.h"

#include "chrome/browser/extensions/convert_web_app.h"

-#include "chrome/browser/extensions/crx_installer_error.h"

#include "chrome/browser/extensions/extension_assets_manager.h"

#include "chrome/browser/extensions/extension_error_reporter.h"

-#include "chrome/browser/extensions/extension_install_ui.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/install_tracker.h"

#include "chrome/browser/extensions/install_tracker_factory.h"

@@ -43,6 +41,8 @@

#include "content/public/browser/user_metrics.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/browser/install/crx_installer_error.h"

+#include "extensions/browser/install/extension_install_ui.h"

#include "extensions/browser/install_flag.h"

#include "extensions/browser/notification_types.h"

#include "extensions/common/extension_icon_set.h"

@@ -139,8 +139,7 @@ CrxInstaller::CrxInstaller(base::WeakPtr<ExtensionService> service_weak,

if (client_) {

client_->install_ui()->SetUseAppInstalledBubble(

approval->use_app_installed_bubble);

- client_->install_ui()->set_skip_post_install_ui(

- approval->skip_post_install_ui);

+ client_->install_ui()->SetSkipPostInstallUI(approval->skip_post_install_ui);

}

if (approval->skip_install_dialog) {

@@ -571,7 +570,7 @@ void CrxInstaller::OnInstallChecksComplete(int failed_checks) {

// because the WebStore already shows an error dialog itself.

// Note: |client_| can be NULL in unit_tests!

if (extension()->from_webstore() && client_)

- client_->install_ui()->set_skip_post_install_ui(true);

+ client_->install_ui()->SetSkipPostInstallUI(true);

ReportFailureFromUIThread(

CrxInstallerError(base::UTF8ToUTF16(install_checker_.policy_error())));

return;