Commit 43e9109d authored by James Forshaw's avatar James Forshaw Committed by Commit Bot

Fix some post-commit nits in style in i18n Windows code.

This CL just fixes a few style nits.

Bug: 986625
Change-Id: I6832c69bb2d91e5a74a9562738a9ca13bb48de63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720732Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681365}
parent 8cdf0c85
...@@ -17,22 +17,21 @@ typedef decltype(::GetSystemPreferredUILanguages)* GetPreferredUILanguages_Fn; ...@@ -17,22 +17,21 @@ typedef decltype(::GetSystemPreferredUILanguages)* GetPreferredUILanguages_Fn;
bool GetPreferredUILanguageList(GetPreferredUILanguages_Fn function, bool GetPreferredUILanguageList(GetPreferredUILanguages_Fn function,
ULONG flags, ULONG flags,
std::vector<base::string16>* languages) { std::vector<base::string16>* languages) {
DCHECK_EQ(0U, (flags & (MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME))); DCHECK_EQ((flags & (MUI_LANGUAGE_ID | MUI_LANGUAGE_NAME)), 0U);
const ULONG call_flags = flags | MUI_LANGUAGE_NAME; const ULONG call_flags = flags | MUI_LANGUAGE_NAME;
ULONG language_count = 0; ULONG language_count = 0;
ULONG buffer_length = 0; ULONG buffer_length = 0;
if (!function(call_flags, &language_count, nullptr, &buffer_length) || if (!function(call_flags, &language_count, nullptr, &buffer_length) ||
0 == buffer_length) { !buffer_length) {
DPCHECK(0 == buffer_length) DPCHECK(!buffer_length) << "Failed getting size of preferred UI languages.";
<< "Failed getting size of preferred UI languages.";
return false; return false;
} }
base::string16 buffer(buffer_length, '\0'); base::string16 buffer(buffer_length, '\0');
if (!function(call_flags, &language_count, base::as_writable_wcstr(buffer), if (!function(call_flags, &language_count, base::as_writable_wcstr(buffer),
&buffer_length) || &buffer_length) ||
0 == language_count) { !language_count) {
DPCHECK(0 == language_count) << "Failed getting preferred UI languages."; DPCHECK(!language_count) << "Failed getting preferred UI languages.";
return false; return false;
} }
......
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
// This file contains unit tests for Windows internationalization funcs. // This file contains unit tests for Windows internationalization funcs.
#include "base/win/i18n.h"
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/win/i18n.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment