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

Unified Diff: ui/base/clipboard/clipboard_aurax11.cc

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_aura.cc ('k') | ui/base/clipboard/clipboard_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_aurax11.cc
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index b9b53f18f365917589b8b64d8b4c6ab0dec78df8..d9759b8de9ed8e35243a49e7c68cf6569c046dd9 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -4,12 +4,14 @@
#include "ui/base/clipboard/clipboard_aurax11.h"
+#include <stdint.h>
#include <X11/extensions/Xfixes.h>
#include <X11/Xatom.h>
+
+#include <limits>
#include <list>
#include <set>
-#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/memory/ref_counted_memory.h"
@@ -65,10 +67,10 @@ class SelectionChangeObserver : public ui::PlatformEventObserver {
public:
static SelectionChangeObserver* GetInstance();
- uint64 clipboard_sequence_number() const {
+ uint64_t clipboard_sequence_number() const {
return clipboard_sequence_number_;
}
- uint64 primary_sequence_number() const { return primary_sequence_number_; }
+ uint64_t primary_sequence_number() const { return primary_sequence_number_; }
private:
friend struct base::DefaultSingletonTraits<SelectionChangeObserver>;
@@ -82,8 +84,8 @@ class SelectionChangeObserver : public ui::PlatformEventObserver {
int event_base_;
Atom clipboard_atom_;
- uint64 clipboard_sequence_number_;
- uint64 primary_sequence_number_;
+ uint64_t clipboard_sequence_number_;
+ uint64_t primary_sequence_number_;
DISALLOW_COPY_AND_ASSIGN(SelectionChangeObserver);
};
@@ -670,7 +672,7 @@ ClipboardAuraX11::~ClipboardAuraX11() {
aurax11_details_->StoreCopyPasteDataAndWait();
}
-uint64 ClipboardAuraX11::GetSequenceNumber(ClipboardType type) const {
+uint64_t ClipboardAuraX11::GetSequenceNumber(ClipboardType type) const {
DCHECK(CalledOnValidThread());
if (type == CLIPBOARD_TYPE_COPY_PASTE)
return SelectionChangeObserver::GetInstance()->clipboard_sequence_number();
@@ -753,8 +755,8 @@ void ClipboardAuraX11::ReadAsciiText(ClipboardType type,
void ClipboardAuraX11::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());
markup->clear();
if (src_url)
@@ -768,8 +770,8 @@ void ClipboardAuraX11::ReadHTML(ClipboardType type,
*markup = data.GetHtml();
*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());
}
}
« no previous file with comments | « ui/base/clipboard/clipboard_aura.cc ('k') | ui/base/clipboard/clipboard_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698