diff options
| author | tfarina <tfarina@chromium.org> | 2014-12-20 19:38:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-21 03:39:13 +0000 |
| commit | 2a812f5f0db0b502c163fefc12aa84e0d0437765 (patch) | |
| tree | 105480ee91988f81f9010876272121a616d5a5f8 | |
| parent | b8e602bfd91331d0d7976ce6e45f846c6d1a8433 (diff) | |
| download | chromium_src-2a812f5f0db0b502c163fefc12aa84e0d0437765.zip chromium_src-2a812f5f0db0b502c163fefc12aa84e0d0437765.tar.gz chromium_src-2a812f5f0db0b502c163fefc12aa84e0d0437765.tar.bz2 | |
Cleanup: Update the path to safe_integer_conversions.h header.
The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so
we are updating the include paths to fix this.
BUG=395370
TEST=ui_base_unittests && gfx_unittests
TBR=sky@chromium.org,danakj@chromium.org
Review URL: https://codereview.chromium.org/820913002
Cr-Commit-Position: refs/heads/master@{#309372}
| -rw-r--r-- | ui/base/resource/resource_bundle.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/animation/tween.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/safe_integer_conversions.h | 7 |
3 files changed, 2 insertions, 9 deletions
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index b08a580..0379b05 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -29,9 +29,9 @@ #include "ui/base/ui_base_switches.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/safe_integer_conversions.h" #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/strings/grit/app_locale_settings.h" diff --git a/ui/gfx/animation/tween.cc b/ui/gfx/animation/tween.cc index ecb928d..0e21bc3 100644 --- a/ui/gfx/animation/tween.cc +++ b/ui/gfx/animation/tween.cc @@ -16,7 +16,7 @@ #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "ui/gfx/geometry/cubic_bezier.h" -#include "ui/gfx/safe_integer_conversions.h" +#include "ui/gfx/geometry/safe_integer_conversions.h" namespace gfx { diff --git a/ui/gfx/safe_integer_conversions.h b/ui/gfx/safe_integer_conversions.h deleted file mode 100644 index ea9fde7..0000000 --- a/ui/gfx/safe_integer_conversions.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// TODO(beng): remove once callsites are patched. -#include "ui/gfx/geometry/safe_integer_conversions.h" - |