diff options
| author | avi <avi@chromium.org> | 2015-12-24 18:23:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-25 02:24:37 +0000 |
| commit | 0f233432263b842ae54e83ac576c218d2326afbb (patch) | |
| tree | 203eeeb3b589c37d708bbe48df53ba4830f12f37 /chrome/browser/ui/webui/omnibox | |
| parent | 652869c276104ba02e827df6ee9a119c78e121e0 (diff) | |
| download | chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.zip chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.tar.gz chromium_src-0f233432263b842ae54e83ac576c218d2326afbb.tar.bz2 | |
Switch to standard integer types in chrome/browser/ui/webui/.
BUG=138542
TBR=bauerb@chromium.org
Review URL: https://codereview.chromium.org/1547103002
Cr-Commit-Position: refs/heads/master@{#366846}
Diffstat (limited to 'chrome/browser/ui/webui/omnibox')
| -rw-r--r-- | chrome/browser/ui/webui/omnibox/omnibox_ui.h | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui.h b/chrome/browser/ui/webui/omnibox/omnibox_ui.h index c91af32..d853ba7 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/ui/webui/mojo_web_ui_controller.h" #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index ec18ff9..6d2792f 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" +#include <stddef.h> + #include <string> #include "base/auto_reset.h" @@ -83,7 +85,7 @@ struct TypeConverter<AutocompleteMatchMojoPtr, AutocompleteMatch> { mojo::String::From(input.associated_keyword->keyword); } result->keyword = mojo::String::From(input.keyword); - result->duplicates = static_cast<int32>(input.duplicate_matches.size()); + result->duplicates = static_cast<int32_t>(input.duplicate_matches.size()); result->from_previous = input.from_previous; result->additional_info = diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h index 15158da..e4e2390 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h @@ -5,8 +5,10 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OMNIBOX_OMNIBOX_UI_HANDLER_H_ -#include "base/basictypes.h" +#include <stdint.h> + #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" |