| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" | 5 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" |
| 6 | 6 |
| 7 #include "base/guid.h" | 7 #include "base/guid.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/md5.h" | 9 #include "base/md5.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 extensions.begin(); i != extensions.end(); ++i) { | 421 extensions.begin(); i != extensions.end(); ++i) { |
| 422 if (!extension_names.empty()) | 422 if (!extension_names.empty()) |
| 423 extension_names += '\n'; | 423 extension_names += '\n'; |
| 424 extension_names += i->second; | 424 extension_names += i->second; |
| 425 } | 425 } |
| 426 if (!extension_names.empty()) { | 426 if (!extension_names.empty()) { |
| 427 AddPair(list.get(), | 427 AddPair(list.get(), |
| 428 l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS), | 428 l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS), |
| 429 extension_names); | 429 extension_names); |
| 430 } | 430 } |
| 431 return list.Pass(); | 431 return list; |
| 432 } | 432 } |
| OLD | NEW |