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 /cc/trees | |
| 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 'cc/trees')
| -rw-r--r-- | cc/trees/layer_tree_host.h | 2 | ||||
| -rw-r--r-- | cc/trees/layer_tree_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index 09f2dec..72a5628 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h @@ -35,7 +35,7 @@ #include "cc/trees/occlusion_tracker.h" #include "cc/trees/proxy.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/base/latency_info.h" +#include "ui/events/latency_info.h" #include "ui/gfx/rect.h" namespace WebKit { class WebGraphicsContext3D; } diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index 7c66759..eb6a015 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h @@ -13,7 +13,7 @@ #include "base/values.h" #include "cc/layers/layer_impl.h" #include "cc/resources/ui_resource_client.h" -#include "ui/base/latency_info.h" +#include "ui/events/latency_info.h" #if defined(COMPILER_GCC) namespace BASE_HASH_NAMESPACE { |