summaryrefslogtreecommitdiffstats
path: root/cc/blink/web_layer_impl.h
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-02-09 09:55:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 17:55:59 +0000
commit911e40ef1f033735fdfe95a411926a1b998ddbfc (patch)
treeefb6ddfd813e4bc47a7927dcd14698af7377a795 /cc/blink/web_layer_impl.h
parent33f729bc81c813e037144676b47794d9ebfca280 (diff)
downloadchromium_src-911e40ef1f033735fdfe95a411926a1b998ddbfc.zip
chromium_src-911e40ef1f033735fdfe95a411926a1b998ddbfc.tar.gz
chromium_src-911e40ef1f033735fdfe95a411926a1b998ddbfc.tar.bz2
mechanical rename of base::debug -> base::trace_event for /cc
This is the last stage of the trace_event directory restructuring. This is part of a set of 3 CLs which is moving tracing clients to use the new base::trace_debug namespace. See crrev.com/837303004 and the related bug for motivations. BUG=451032 TBR=nduca@chromium.org Review URL: https://codereview.chromium.org/879913002 Cr-Commit-Position: refs/heads/master@{#315335}
Diffstat (limited to 'cc/blink/web_layer_impl.h')
-rw-r--r--cc/blink/web_layer_impl.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index 787f632..83f6cf2 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -34,13 +34,7 @@ namespace base {
namespace trace_event {
class ConvertableToTraceFormat;
}
-
-// TODO(ssid): remove these aliases after the tracing clients are moved to the
-// new trace_event namespace. See crbug.com/451032. ETA: March 2015.
-namespace debug {
-using ::base::trace_event::ConvertableToTraceFormat;
}
-} // namespace base
namespace cc {
class Layer;
@@ -141,7 +135,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
virtual void setWebLayerClient(blink::WebLayerClient* client);
// LayerClient implementation.
- scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override;
+ scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo()
+ override;
virtual void setScrollParent(blink::WebLayer* parent);
virtual void setClipParent(blink::WebLayer* parent);