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

Side by Side Diff: third_party/WebKit/Source/platform/text/LocaleMac.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #ifndef LocaleMac_h 31 #ifndef LocaleMac_h
32 #define LocaleMac_h 32 #define LocaleMac_h
33 33
34 #include "platform/text/PlatformLocale.h" 34 #include "platform/text/PlatformLocale.h"
35 #include "wtf/Forward.h" 35 #include "wtf/Forward.h"
36 #include "wtf/RetainPtr.h" 36 #include "wtf/RetainPtr.h"
37 #include "wtf/Vector.h" 37 #include "wtf/Vector.h"
38 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
39 #include <memory>
40 39
41 OBJC_CLASS NSCalendar; 40 OBJC_CLASS NSCalendar;
42 OBJC_CLASS NSDateFormatter; 41 OBJC_CLASS NSDateFormatter;
43 OBJC_CLASS NSLocale; 42 OBJC_CLASS NSLocale;
44 43
45 namespace blink { 44 namespace blink {
46 45
47 class PLATFORM_EXPORT LocaleMac : public Locale { 46 class PLATFORM_EXPORT LocaleMac : public Locale {
48 public: 47 public:
49 static std::unique_ptr<LocaleMac> create(const String&); 48 static PassOwnPtr<LocaleMac> create(const String&);
50 static std::unique_ptr<LocaleMac> create(NSLocale*); 49 static PassOwnPtr<LocaleMac> create(NSLocale*);
51 ~LocaleMac(); 50 ~LocaleMac();
52 51
53 const Vector<String>& weekDayShortLabels() override; 52 const Vector<String>& weekDayShortLabels() override;
54 unsigned firstDayOfWeek() override; 53 unsigned firstDayOfWeek() override;
55 bool isRTL() override; 54 bool isRTL() override;
56 55
57 String dateFormat() override; 56 String dateFormat() override;
58 String monthFormat() override; 57 String monthFormat() override;
59 String shortMonthFormat() override; 58 String shortMonthFormat() override;
60 String timeFormat() override; 59 String timeFormat() override;
(...skipping 29 matching lines...) Expand all
90 String m_dateTimeFormatWithoutSeconds; 89 String m_dateTimeFormatWithoutSeconds;
91 Vector<String> m_shortMonthLabels; 90 Vector<String> m_shortMonthLabels;
92 Vector<String> m_standAloneMonthLabels; 91 Vector<String> m_standAloneMonthLabels;
93 Vector<String> m_shortStandAloneMonthLabels; 92 Vector<String> m_shortStandAloneMonthLabels;
94 Vector<String> m_timeAMPMLabels; 93 Vector<String> m_timeAMPMLabels;
95 bool m_didInitializeNumberData; 94 bool m_didInitializeNumberData;
96 }; 95 };
97 96
98 } // namespace blink 97 } // namespace blink
99 #endif 98 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/text/LocaleICUTest.cpp ('k') | third_party/WebKit/Source/platform/text/LocaleMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698