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

Unified Diff: third_party/WebKit/Source/platform/text/LocaleICU.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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/text/LocaleICU.h
diff --git a/third_party/WebKit/Source/platform/text/LocaleICU.h b/third_party/WebKit/Source/platform/text/LocaleICU.h
index 5c7c2c6be5e9321a7c444132269e041b2e5a30f8..9cc75743038755b24166eeb6b93530bfdba0931e 100644
--- a/third_party/WebKit/Source/platform/text/LocaleICU.h
+++ b/third_party/WebKit/Source/platform/text/LocaleICU.h
@@ -31,14 +31,14 @@
#ifndef LocaleICU_h
#define LocaleICU_h
+#include <unicode/udat.h>
+#include <unicode/unum.h>
#include "platform/DateComponents.h"
#include "platform/text/PlatformLocale.h"
#include "wtf/Forward.h"
+#include "wtf/OwnPtr.h"
#include "wtf/text/CString.h"
#include "wtf/text/WTFString.h"
-#include <memory>
-#include <unicode/udat.h>
-#include <unicode/unum.h>
namespace blink {
@@ -46,7 +46,7 @@ namespace blink {
// and LocalizedNumberICUTest.cpp.
class PLATFORM_EXPORT LocaleICU : public Locale {
public:
- static std::unique_ptr<LocaleICU> create(const char* localeString);
+ static PassOwnPtr<LocaleICU> create(const char* localeString);
~LocaleICU() override;
const Vector<String>& weekDayShortLabels() override;
@@ -80,7 +80,7 @@ private:
void initializeCalendar();
- std::unique_ptr<Vector<String>> createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size);
+ PassOwnPtr<Vector<String>> createLabelVector(const UDateFormat*, UDateFormatSymbolType, int32_t startIndex, int32_t size);
void initializeDateTimeFormat();
CString m_locale;
@@ -89,9 +89,9 @@ private:
bool m_didCreateDecimalFormat;
bool m_didCreateShortDateFormat;
- std::unique_ptr<Vector<String>> m_weekDayShortLabels;
+ OwnPtr<Vector<String>> m_weekDayShortLabels;
unsigned m_firstDayOfWeek;
- std::unique_ptr<Vector<String>> m_monthLabels;
+ OwnPtr<Vector<String>> m_monthLabels;
String m_dateFormat;
String m_monthFormat;
String m_shortMonthFormat;
« no previous file with comments | « third_party/WebKit/Source/platform/text/BidiResolverTest.cpp ('k') | third_party/WebKit/Source/platform/text/LocaleICU.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698