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

Unified Diff: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
Index: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
index 5bc60d9c97aa27ec214be10e212991c5d60d3246..2c495aa790055e31f03e06b5feedf9a761ded71d 100644
--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc
@@ -29,11 +29,12 @@ void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents,
Profile::FromBrowserContext(web_contents->GetBrowserContext());
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents);
- scoped_ptr<infobars::InfoBar> infobar(infobar_service->CreateConfirmInfoBar(
- scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate(
- num_popups,
- url,
- HostContentSettingsMapFactory::GetForProfile(profile)))));
+ std::unique_ptr<infobars::InfoBar> infobar(
+ infobar_service->CreateConfirmInfoBar(
+ std::unique_ptr<ConfirmInfoBarDelegate>(
+ new PopupBlockedInfoBarDelegate(
+ num_popups, url,
+ HostContentSettingsMapFactory::GetForProfile(profile)))));
// See if there is an existing popup infobar already.
// TODO(dfalcantara) When triggering more than one popup the infobar
@@ -73,7 +74,7 @@ PopupBlockedInfoBarDelegate::PopupBlockedInfoBarDelegate(
HostContentSettingsMap* map)
: ConfirmInfoBarDelegate(), num_popups_(num_popups), url_(url), map_(map) {
content_settings::SettingInfo setting_info;
- scoped_ptr<base::Value> setting = map->GetWebsiteSetting(
+ std::unique_ptr<base::Value> setting = map->GetWebsiteSetting(
url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &setting_info);
can_show_popups_ =
setting_info.source != content_settings::SETTING_SOURCE_POLICY;
« no previous file with comments | « chrome/browser/ui/android/connection_info_popup_android.h ('k') | chrome/browser/ui/android/context_menu_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698