Final pieces of int16 and .Pass()

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

diff --git a/atom/browser/ui/views/submenu_button.cc b/atom/browser/ui/views/submenu_button.cc
index 7f413d5..72cab25 100644 (file)
--- a/atom/browser/ui/views/submenu_button.cc
+++ b/atom/browser/ui/views/submenu_button.cc
@@ -37,7 +37,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
       underline_color_(SK_ColorBLACK) {
 #if defined(OS_LINUX)
   // Dont' use native style border.
-  SetBorder(CreateDefaultBorder().Pass());
+  SetBorder(std::move(CreateDefaultBorder()));
 #endif
 
   if (GetUnderlinePosition(title, &accelerator_, &underline_start_,