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

Unified Diff: chrome/browser/ui/website_settings/website_settings.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/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index e74b86bb90fbcbc229da83dd6501319304a4ba7c..0e228700e2a12dce4aba24271451f2b02a32495b 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -672,9 +672,8 @@ void WebsiteSettings::PresentSitePermissions() {
continue;
content_settings::SettingInfo info;
- scoped_ptr<base::Value> value =
- content_settings_->GetWebsiteSetting(
- site_url_, site_url_, permission_info.type, std::string(), &info);
+ std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting(
+ site_url_, site_url_, permission_info.type, std::string(), &info);
DCHECK(value.get());
if (value->GetType() == base::Value::TYPE_INTEGER) {
permission_info.setting =
@@ -710,7 +709,7 @@ void WebsiteSettings::PresentSitePermissions() {
ChooserContextBase* context = ui_info.get_context(profile_);
const GURL origin = site_url_.GetOrigin();
auto chosen_objects = context->GetGrantedObjects(origin, origin);
- for (scoped_ptr<base::DictionaryValue>& object : chosen_objects) {
+ for (std::unique_ptr<base::DictionaryValue>& object : chosen_objects) {
chosen_object_info_list.push_back(
new WebsiteSettingsUI::ChosenObjectInfo(ui_info, std::move(object)));
}

Powered by Google App Engine
This is Rietveld 408576698