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

Unified Diff: win8/metro_driver/ime/text_store.h

Issue 1540973003: Switch to standard integer types in win8/. (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
« no previous file with comments | « win8/metro_driver/ime/text_service_delegate.h ('k') | win8/metro_driver/ime/text_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/ime/text_store.h
diff --git a/win8/metro_driver/ime/text_store.h b/win8/metro_driver/ime/text_store.h
index 3af5bf20991dc368f7f2d39cebf366514771e749..123a8245d786f5891fb856d36f931c4b89826531 100644
--- a/win8/metro_driver/ime/text_store.h
+++ b/win8/metro_driver/ime/text_store.h
@@ -10,12 +10,13 @@
#include <initguid.h>
#include <inputscope.h>
#include <msctf.h>
+#include <stdint.h>
#include <deque>
#include <vector>
-#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string16.h"
#include "base/win/scoped_comptr.h"
@@ -245,7 +246,7 @@ class ATL_NO_VTABLE TextStore
bool GetCompositionStatus(
ITfContext* context,
const TfEditCookie read_only_edit_cookie,
- uint32* committed_size,
+ uint32_t* committed_size,
std::vector<metro_viewer::UnderlineInfo>* undelines);
// A pointer of ITextStoreACPSink, this instance is given in AdviseSink.
@@ -262,15 +263,15 @@ class ATL_NO_VTABLE TextStore
// |string_buffer_|: "aoiumi"
// |committed_size_|: 3
base::string16 string_buffer_;
- uint32 committed_size_;
+ uint32_t committed_size_;
// |selection_start_| and |selection_end_| indicates the selection range.
// Example: "iue" is selected
// |string_buffer_|: "aiueo"
// |selection_start_|: 1
// |selection_end_|: 4
- uint32 selection_start_;
- uint32 selection_end_;
+ uint32_t selection_start_;
+ uint32_t selection_end_;
// |start_offset| and |end_offset| of |composition_undelines_| indicates
// the offsets in |string_buffer_|.
« no previous file with comments | « win8/metro_driver/ime/text_service_delegate.h ('k') | win8/metro_driver/ime/text_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698