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

Unified Diff: ui/base/clipboard/clipboard_mac.mm

Issue 1492403002: Remove kuint32max. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: http security header file 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
« no previous file with comments | « ui/base/clipboard/clipboard_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_mac.mm
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 306502f62d1260bba4e0b2477e1251b4653e2eba..05da58b29e4f48ac337c9d3676104ef7645121ff 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -5,8 +5,10 @@
#include "ui/base/clipboard/clipboard_mac.h"
#import <Cocoa/Cocoa.h>
+#include <stdint.h>
+
+#include <limits>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/mac/mac_util.h"
@@ -183,7 +185,7 @@ ClipboardMac::~ClipboardMac() {
DCHECK(CalledOnValidThread());
}
-uint64 ClipboardMac::GetSequenceNumber(ClipboardType type) const {
+uint64_t ClipboardMac::GetSequenceNumber(ClipboardType type) const {
DCHECK(CalledOnValidThread());
DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE);
@@ -264,8 +266,8 @@ void ClipboardMac::ReadAsciiText(ClipboardType type,
void ClipboardMac::ReadHTML(ClipboardType type,
base::string16* markup,
std::string* src_url,
- uint32* fragment_start,
- uint32* fragment_end) const {
+ uint32_t* fragment_start,
+ uint32_t* fragment_end) const {
DCHECK(CalledOnValidThread());
DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE);
@@ -288,8 +290,8 @@ void ClipboardMac::ReadHTML(ClipboardType type,
}
*fragment_start = 0;
- DCHECK(markup->length() <= kuint32max);
- *fragment_end = static_cast<uint32>(markup->length());
+ DCHECK(markup->length() <= std::numeric_limits<uint32_t>::max());
+ *fragment_end = static_cast<uint32_t>(markup->length());
}
void ClipboardMac::ReadRTF(ClipboardType type, std::string* result) const {
« no previous file with comments | « ui/base/clipboard/clipboard_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698