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

Unified Diff: content/shell/browser/shell_devtools_manager_delegate.cc

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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: content/shell/browser/shell_devtools_manager_delegate.cc
diff --git a/content/shell/browser/shell_devtools_manager_delegate.cc b/content/shell/browser/shell_devtools_manager_delegate.cc
index 3665f6d44e0966631965f3f1b6c442b23b6c5a18..39e290f987cc0594f3d190f60a3069f4ad89634b 100644
--- a/content/shell/browser/shell_devtools_manager_delegate.cc
+++ b/content/shell/browser/shell_devtools_manager_delegate.cc
@@ -4,14 +4,18 @@
#include "content/shell/browser/shell_devtools_manager_delegate.h"
+#include <stdint.h>
+
#include <vector>
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
#include "components/devtools_discovery/basic_target_descriptor.h"
#include "components/devtools_discovery/devtools_discovery_manager.h"
#include "components/devtools_http_handler/devtools_http_handler.h"
@@ -78,9 +82,8 @@ class UnixDomainServerSocketFactory
class TCPServerSocketFactory
: public DevToolsHttpHandler::ServerSocketFactory {
public:
- TCPServerSocketFactory(const std::string& address, uint16 port)
- : address_(address), port_(port) {
- }
+ TCPServerSocketFactory(const std::string& address, uint16_t port)
+ : address_(address), port_(port) {}
private:
// DevToolsHttpHandler::ServerSocketFactory.
@@ -94,7 +97,7 @@ class TCPServerSocketFactory
}
std::string address_;
- uint16 port_;
+ uint16_t port_;
DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
};
@@ -115,14 +118,14 @@ CreateSocketFactory() {
#else
// See if the user specified a port on the command line (useful for
// automation). If not, use an ephemeral port by specifying 0.
- uint16 port = 0;
+ uint16_t port = 0;
if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {
int temp_port;
std::string port_str =
command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
if (base::StringToInt(port_str, &temp_port) &&
temp_port >= 0 && temp_port < 65535) {
- port = static_cast<uint16>(temp_port);
+ port = static_cast<uint16_t>(temp_port);
} else {
DLOG(WARNING) << "Invalid http debugger port number " << temp_port;
}
« no previous file with comments | « content/shell/browser/shell_devtools_manager_delegate.h ('k') | content/shell/browser/shell_download_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698