diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 09:59:13 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 10:28:53 +0000 |
commit | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch) | |
tree | c8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/base/logging.h | |
parent | 3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff) |
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/logging.h')
-rw-r--r-- | chromium/base/logging.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/base/logging.h b/chromium/base/logging.h index 67f463217ae..250239a48d8 100644 --- a/chromium/base/logging.h +++ b/chromium/base/logging.h @@ -162,7 +162,7 @@ namespace logging { // TODO(avi): do we want to do a unification of character types here? #if defined(OS_WIN) -typedef wchar_t PathChar; +typedef base::char16 PathChar; #elif defined(OS_POSIX) || defined(OS_FUCHSIA) typedef char PathChar; #endif @@ -1135,7 +1135,7 @@ BASE_EXPORT void RawLog(int level, const char* message); BASE_EXPORT bool IsLoggingToFileEnabled(); // Returns the default log file path. -BASE_EXPORT std::wstring GetLogFileFullPath(); +BASE_EXPORT base::string16 GetLogFileFullPath(); #endif } // namespace logging |