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

Side by Side Diff: chromeos/settings/timezone_settings_helper.h

Issue 2387783002: Remove stl_util's deletion functions from chromeos/. (Closed)
Patch Set: armansito Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « chromeos/settings/timezone_settings.cc ('k') | chromeos/settings/timezone_settings_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_ 5 #ifndef CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_
6 #define CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_ 6 #define CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "third_party/icu/source/i18n/unicode/timezone.h" 11 #include "third_party/icu/source/i18n/unicode/timezone.h"
11 12
12 namespace chromeos { 13 namespace chromeos {
13 namespace system { 14 namespace system {
14 15
15 // Return a timezone in the list matching |timezone| in terms of 16 // Return a timezone in the list matching |timezone| in terms of
16 // id and canonical id. If both fail, return a timezone with 17 // id and canonical id. If both fail, return a timezone with
17 // the same rules. Otherwise, return null. 18 // the same rules. Otherwise, return null.
18 const icu::TimeZone* GetKnownTimezoneOrNull( 19 const icu::TimeZone* GetKnownTimezoneOrNull(
19 const icu::TimeZone& timezone, 20 const icu::TimeZone& timezone,
20 const std::vector<icu::TimeZone*>& timezone_list); 21 const std::vector<std::unique_ptr<icu::TimeZone>>& timezone_list);
21 22
22 } // namespace system 23 } // namespace system
23 } // namespace chromeos 24 } // namespace chromeos
24 25
25 #endif // CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_ 26 #endif // CHROMEOS_SETTINGS_TIMEZONE_SETTINGS_HELPER_H_
OLDNEW
« no previous file with comments | « chromeos/settings/timezone_settings.cc ('k') | chromeos/settings/timezone_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698