diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /chrome/browser/sync/about_sync_util.cc | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'chrome/browser/sync/about_sync_util.cc')
| -rw-r--r-- | chrome/browser/sync/about_sync_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/about_sync_util.cc b/chrome/browser/sync/about_sync_util.cc index 36e2221d10..3ef918f4a9 100644 --- a/chrome/browser/sync/about_sync_util.cc +++ b/chrome/browser/sync/about_sync_util.cc @@ -62,7 +62,7 @@ class StringSyncStat { public: StringSyncStat(ListValue* section, const std::string& key); void SetValue(const std::string& value); - void SetValue(const string16& value); + void SetValue(const base::string16& value); private: // Owned by the |section| passed in during construction. @@ -82,7 +82,7 @@ void StringSyncStat::SetValue(const std::string& value) { stat_->SetBoolean("is_valid", true); } -void StringSyncStat::SetValue(const string16& value) { +void StringSyncStat::SetValue(const base::string16& value) { stat_->SetString("stat_value", value); stat_->SetBoolean("is_valid", true); } |