diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 19:39:41 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 19:39:41 +0000 |
| commit | f40d3a0012f7cd20103946471f3044cb990b3fb3 (patch) | |
| tree | 00a0b718b9cb191319e28248c34f53c6fd98db81 /ui/surface | |
| parent | 358ff8988d0a6717945d41d0fd8b770fd7d556c5 (diff) | |
| download | chromium_src-f40d3a0012f7cd20103946471f3044cb990b3fb3.zip chromium_src-f40d3a0012f7cd20103946471f3044cb990b3fb3.tar.gz chromium_src-f40d3a0012f7cd20103946471f3044cb990b3fb3.tar.bz2 | |
Revert "Revert 224496 "Move ui/base/latency_info* to ui/events""
This reverts commit d1ec3f7f30d07132bf0f75e4938d50a508bc7637.
Attempt at re-landing this previous change. Moves LatencyInfo from ui/base to ui/events.
TBR=sky@chromium.org,jamesr@chromium.org,jschuh@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/24257011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
| -rw-r--r-- | ui/surface/accelerated_surface_win.cc | 2 | ||||
| -rw-r--r-- | ui/surface/accelerated_surface_win.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index 3faf01d..15d78c0 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -25,8 +25,8 @@ #include "media/base/video_frame.h" #include "media/base/video_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/latency_info.h" #include "ui/base/win/shell.h" +#include "ui/events/latency_info.h" #include "ui/gfx/rect.h" #include "ui/gfx/win/dpi.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/ui/surface/accelerated_surface_win.h b/ui/surface/accelerated_surface_win.h index 110e206..7c4164b 100644 --- a/ui/surface/accelerated_surface_win.h +++ b/ui/surface/accelerated_surface_win.h @@ -14,7 +14,7 @@ #include "base/synchronization/waitable_event.h" #include "base/time/time.h" #include "base/win/scoped_comptr.h" -#include "ui/base/latency_info.h" +#include "ui/events/latency_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/surface/surface_export.h" |