| Index: chrome/browser/banners/app_banner_manager.cc
|
| diff --git a/chrome/browser/banners/app_banner_manager.cc b/chrome/browser/banners/app_banner_manager.cc
|
| index ee166f2f946fd83b6c08b95142952d2ccc8668de..ad4216830915c63aa2f374c59c9f372a048a5911 100644
|
| --- a/chrome/browser/banners/app_banner_manager.cc
|
| +++ b/chrome/browser/banners/app_banner_manager.cc
|
| @@ -30,7 +30,6 @@
|
|
|
| namespace {
|
|
|
| -int gCurrentRequestID = -1;
|
| int gTimeDeltaInDaysForTesting = 0;
|
|
|
| InstallableParams ParamsToGetManifest() {
|
| @@ -115,20 +114,14 @@ void AppBannerManager::OnInstall() {
|
| installation_service->OnInstall();
|
| }
|
|
|
| -void AppBannerManager::SendBannerAccepted(int request_id) {
|
| - if (request_id != gCurrentRequestID)
|
| - return;
|
| -
|
| - DCHECK(event_.is_bound());
|
| - event_->BannerAccepted(GetBannerType());
|
| +void AppBannerManager::SendBannerAccepted() {
|
| + if (event_.is_bound())
|
| + event_->BannerAccepted(GetBannerType());
|
| }
|
|
|
| -void AppBannerManager::SendBannerDismissed(int request_id) {
|
| - if (request_id != gCurrentRequestID)
|
| - return;
|
| -
|
| - DCHECK(event_.is_bound());
|
| - event_->BannerDismissed();
|
| +void AppBannerManager::SendBannerDismissed() {
|
| + if (event_.is_bound())
|
| + event_->BannerDismissed();
|
| }
|
|
|
| base::WeakPtr<AppBannerManager> AppBannerManager::GetWeakPtr() {
|
| @@ -141,7 +134,6 @@ AppBannerManager::AppBannerManager(content::WebContents* web_contents)
|
| Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
|
| state_(State::INACTIVE),
|
| manager_(InstallableManager::FromWebContents(web_contents)),
|
| - event_request_id_(-1),
|
| binding_(this),
|
| has_sufficient_engagement_(false),
|
| load_finished_(false),
|
| @@ -352,9 +344,7 @@ void AppBannerManager::Stop() {
|
|
|
| void AppBannerManager::SendBannerPromptRequest() {
|
| RecordCouldShowBanner();
|
| -
|
| TrackBeforeInstallEvent(BEFORE_INSTALL_EVENT_CREATED);
|
| - event_request_id_ = ++gCurrentRequestID;
|
|
|
| web_contents()->GetMainFrame()->GetRemoteInterfaces()->GetInterface(
|
| mojo::MakeRequest(&controller_));
|
|
|