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

Unified Diff: win8/metro_driver/chrome_app_view_ash.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/delegate_execute/delegate_execute_operation.cc ('k') | win8/metro_driver/chrome_app_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/chrome_app_view_ash.h
diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h
index 9fd7c294dabeaeb31d942d69ef4efb0845b8bbb8..ffe1d7e203d5fd2efc10c72cba0f28b0541c018f 100644
--- a/win8/metro_driver/chrome_app_view_ash.h
+++ b/win8/metro_driver/chrome_app_view_ash.h
@@ -5,6 +5,7 @@
#ifndef WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_
#define WIN8_METRO_DRIVER_CHROME_APP_VIEW_ASH_H_
+#include <stdint.h>
#include <windows.applicationmodel.core.h>
#include <windows.ui.core.h>
#include <windows.ui.input.h>
@@ -108,7 +109,7 @@ class ChromeAppViewAsh
void OnImeCancelComposition();
void OnImeUpdateTextInputClient(
- const std::vector<int32>& input_scopes,
+ const std::vector<int32_t>& input_scopes,
const std::vector<metro_viewer::CharacterBounds>& character_bounds);
void OnMetroExit(MetroTerminateMethod method);
@@ -128,8 +129,8 @@ class ChromeAppViewAsh
// TextServiceDelegate overrides.
void OnCompositionChanged(
const base::string16& text,
- int32 selection_start,
- int32 selection_end,
+ int32_t selection_start,
+ int32_t selection_end,
const std::vector<metro_viewer::UnderlineInfo>& underlines) override;
void OnTextCommitted(const base::string16& text) override;
@@ -139,7 +140,7 @@ class ChromeAppViewAsh
int y,
int extra,
ui::EventType event_type,
- uint32 flags,
+ uint32_t flags,
ui::EventFlags changed_button,
bool is_horizontal_wheel);
@@ -223,7 +224,7 @@ class ChromeAppViewAsh
// Keep state about which button is currently down, if any, as PointerMoved
// events do not contain that state, but Ash's MouseEvents need it. Value is
// as a bitmask of ui::EventFlags.
- uint32 mouse_down_flags_;
+ uint32_t mouse_down_flags_;
// Set the D3D swap chain and nothing else.
metro_driver::Direct3DHelper direct3d_helper_;
« no previous file with comments | « win8/delegate_execute/delegate_execute_operation.cc ('k') | win8/metro_driver/chrome_app_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698