Switch to standard integer types in mandoline/.

BUG=138542
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/1548553002

Cr-Commit-Position: refs/heads/master@{#366504}

10 files changed, 18 insertions, 2 deletions

diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
index 6c3ab0c1..1f1d6fc 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/simple_thread.h"
diff --git a/mandoline/ui/desktop_ui/browser_apptest.cc b/mandoline/ui/desktop_ui/browser_apptest.cc
index 1673cde..ccc35e7 100644
--- a/mandoline/ui/desktop_ui/browser_apptest.cc
+++ b/mandoline/ui/desktop_ui/browser_apptest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/macros.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
diff --git a/mandoline/ui/desktop_ui/browser_commands.h b/mandoline/ui/desktop_ui/browser_commands.h
index 9d0b0cf..df18c68 100644
--- a/mandoline/ui/desktop_ui/browser_commands.h
+++ b/mandoline/ui/desktop_ui/browser_commands.h
@@ -5,6 +5,8 @@
 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_COMMANDS_H_
 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_COMMANDS_H_
 
+#include <stdint.h>
+
 namespace mandoline {
 
 enum class BrowserCommand : uint32_t {
diff --git a/mandoline/ui/desktop_ui/browser_manager.h b/mandoline/ui/desktop_ui/browser_manager.h
index 9066849..1fbf1dd 100644
--- a/mandoline/ui/desktop_ui/browser_manager.h
+++ b/mandoline/ui/desktop_ui/browser_manager.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "base/macros.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
 #include "mojo/application/public/cpp/application_delegate.h"
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index 2397a653..ba3d24c 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -4,9 +4,12 @@
 
 #include "mandoline/ui/desktop_ui/browser_window.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h
index 04c5c38..701fec9 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -5,6 +5,9 @@
 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
diff --git a/mandoline/ui/desktop_ui/find_bar_view.h b/mandoline/ui/desktop_ui/find_bar_view.h
index 482cae1..20099b3 100644
--- a/mandoline/ui/desktop_ui/find_bar_view.h
+++ b/mandoline/ui/desktop_ui/find_bar_view.h
@@ -5,9 +5,10 @@
 #ifndef MANDOLINE_UI_DESKTOP_UI_FIND_BAR_VIEW_H_
 #define MANDOLINE_UI_DESKTOP_UI_FIND_BAR_VIEW_H_
 
-#include "ui/views/view.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
+#include "ui/views/view.h"
 
 namespace views {
 class BoxLayout;
diff --git a/mandoline/ui/desktop_ui/toolbar_view.h b/mandoline/ui/desktop_ui/toolbar_view.h
index d67ae73..ad808e1 100644
--- a/mandoline/ui/desktop_ui/toolbar_view.h
+++ b/mandoline/ui/desktop_ui/toolbar_view.h
@@ -5,8 +5,9 @@
 #ifndef MANDOLINE_UI_DESKTOP_UI_TOOLBAR_VIEW_H_
 #define MANDOLINE_UI_DESKTOP_UI_TOOLBAR_VIEW_H_
 
-#include "ui/views/view.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/view.h"
 
 namespace views {
 class BoxLayout;
diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc
index c6cdfd0..bfbe69c 100644
--- a/mandoline/ui/omnibox/omnibox_application.cc
+++ b/mandoline/ui/omnibox/omnibox_application.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/window.h"
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
index 66a7a9e..0da7ce0 100644
--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h
+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h
@@ -5,6 +5,8 @@
 #ifndef MANDOLINE_UI_PHONE_UI_PHONE_BROWSER_APPLICATION_DELEGATE_H_
 #define MANDOLINE_UI_PHONE_UI_PHONE_BROWSER_APPLICATION_DELEGATE_H_
 
+#include <stdint.h>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/window_observer.h"