mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Final pieces of int16 and .Pass()

Browse source
This commit is contained in:
Cheng Zhao 2016-03-08 23:35:52 +09:00
parent f29d633563
commit a31cbd24a1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/net/atom_ssl_config_service.cc
View file

@ -18,8 +18,8 @@ namespace atom {
namespace { namespace {
uint16 GetSSLProtocolVersion(const std::string& version_string) { uint16_t GetSSLProtocolVersion(const std::string& version_string) {
uint16 version = 0; // Invalid uint16_t version = 0; // Invalid
if (version_string == "tls1") if (version_string == "tls1")
version = net::SSL_PROTOCOL_VERSION_TLS1; version = net::SSL_PROTOCOL_VERSION_TLS1;
else if (version_string == "tls1.1") else if (version_string == "tls1.1")
@ -35,7 +35,7 @@ std::vector<uint16> ParseCipherSuites(
cipher_suites.reserve(cipher_strings.size()); cipher_suites.reserve(cipher_strings.size());
for (auto& cipher_string : cipher_strings) { for (auto& cipher_string : cipher_strings) {
uint16 cipher_suite = 0; uint16_t cipher_suite = 0;
if (!net::ParseSSLCipherString(cipher_string, &cipher_suite)) { if (!net::ParseSSLCipherString(cipher_string, &cipher_suite)) {
LOG(ERROR) << "Ignoring unrecognised cipher suite : " LOG(ERROR) << "Ignoring unrecognised cipher suite : "
<< cipher_string; << cipher_string;

2
atom/browser/ui/views/submenu_button.cc
View file

@ -37,7 +37,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
underline_color_(SK_ColorBLACK) { underline_color_(SK_ColorBLACK) {
#if defined(OS_LINUX) #if defined(OS_LINUX)
// Dont' use native style border. // Dont' use native style border.
SetBorder(CreateDefaultBorder().Pass()); SetBorder(std::move(CreateDefaultBorder()));
#endif #endif
if (GetUnderlinePosition(title, &accelerator_, &underline_start_, if (GetUnderlinePosition(title, &accelerator_, &underline_start_,