Chromium Code Reviews| Index: ui/display/chromeos/output_configurator_unittest.cc |
| diff --git a/ui/display/chromeos/output_configurator_unittest.cc b/ui/display/chromeos/output_configurator_unittest.cc |
| index 0f5e6db01f61127f784bd8e134ccaa887323056a..9dfafe5aa9822e6e48ecd1cbeefa8e5a22e174d9 100644 |
| --- a/ui/display/chromeos/output_configurator_unittest.cc |
| +++ b/ui/display/chromeos/output_configurator_unittest.cc |
| @@ -4,13 +4,14 @@ |
| #include "ui/display/chromeos/output_configurator.h" |
| +#include <stdint.h> |
| + |
| #include <cmath> |
| #include <cstdarg> |
| #include <map> |
| #include <string> |
| #include <vector> |
| -#include "base/basictypes.h" |
| #include "base/compiler_specific.h" |
| #include "base/format_macros.h" |
| #include "base/memory/scoped_vector.h" |
| @@ -43,7 +44,7 @@ std::string DisplaySnapshotToString(const DisplaySnapshot& output) { |
| // Returns a string describing a TestNativeDisplayDelegate::SetBackgroundColor() |
| // call. |
| -std::string GetBackgroundAction(uint32 color_argb) { |
| +std::string GetBackgroundAction(uint32_t color_argb) { |
| return base::StringPrintf("background(0x%x)", color_argb); |
| } |
| @@ -212,7 +213,7 @@ class TestNativeDisplayDelegate : public NativeDisplayDelegate { |
| virtual void GrabServer() OVERRIDE { log_->AppendAction(kGrab); } |
| virtual void UngrabServer() OVERRIDE { log_->AppendAction(kUngrab); } |
| virtual void SyncWithServer() OVERRIDE { log_->AppendAction(kSync); } |
| - virtual void SetBackgroundColor(uint32 color_argb) OVERRIDE { |
| + virtual void SetBackgroundColor(uint32_t color_argb) OVERRIDE { |
| log_->AppendAction(GetBackgroundAction(color_argb)); |
| } |
| virtual void ForceDPMSOn() OVERRIDE { log_->AppendAction(kForceDPMS); } |
| @@ -349,10 +350,10 @@ class TestStateController : public OutputConfigurator::StateController { |
| // OutputConfigurator::StateController overrides: |
| virtual OutputState GetStateForDisplayIds( |
| - const std::vector<int64>& outputs) const OVERRIDE { |
| + const std::vector<int64_t>& outputs) const OVERRIDE { |
| return state_; |
| } |
| - virtual bool GetResolutionForDisplayId(int64 display_id, |
| + virtual bool GetResolutionForDisplayId(int64_t display_id, |
|
Daniel Erat
2014/03/27 20:33:07
nit: not for this change, but it'd probably be nic
dnicoara
2014/03/27 21:12:21
OK, I'll take a look. We likely want to change ui/
|
| gfx::Size* size) const OVERRIDE { |
| return false; |
| } |