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

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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/chromeos/ownership/owner_settings_service_chromeos.h
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
index 4429ba357fabfef1959ead102370d599466db561..354450bada1cb453a8a64a45e77546fbbdcf9816 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
@@ -178,7 +178,7 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
bool has_pending_fixups_;
// A set of pending changes to device settings.
- base::ScopedPtrHashMap<std::string, base::Value> pending_changes_;
+ base::ScopedPtrHashMap<std::string, scoped_ptr<base::Value>> pending_changes_;
// True if there're pending changes to management settings.
bool has_pending_management_settings_;
« no previous file with comments | « chrome/browser/chromeos/net/wake_on_wifi_manager.h ('k') | chrome/browser/chromeos/power/extension_event_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698