Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3634)

Unified Diff: blimp/client/compositor/blimp_compositor.cc

Issue 1570943002: [Blimp client] Move client code into blimp::client namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/client/compositor/blimp_compositor.h ('k') | blimp/client/compositor/blimp_compositor_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/compositor/blimp_compositor.cc
diff --git a/blimp/client/compositor/blimp_compositor.cc b/blimp/client/compositor/blimp_compositor.cc
index 107ac26b014c306e2669343efcc73b3e6038061b..6fdbe346f2a9d4dea28d9c5086b670c152df5dbd 100644
--- a/blimp/client/compositor/blimp_compositor.cc
+++ b/blimp/client/compositor/blimp_compositor.cc
@@ -27,6 +27,8 @@
#include "net/base/net_errors.h"
#include "ui/gl/gl_surface.h"
+namespace blimp {
+namespace client {
namespace {
base::LazyInstance<blimp::BlimpTaskGraphRunner> g_task_graph_runner =
@@ -36,13 +38,11 @@ const int kDummyTabId = 0;
// TODO(dtrainor): Replace this when Layer content comes from the server (see
// crbug.com/527200 for details).
-base::LazyInstance<blimp::DummyLayerDriver> g_dummy_layer_driver =
+base::LazyInstance<DummyLayerDriver> g_dummy_layer_driver =
LAZY_INSTANCE_INITIALIZER;
} // namespace
-namespace blimp {
-
BlimpCompositor::BlimpCompositor(float dp_to_px,
RenderWidgetFeature* render_widget_feature)
: device_scale_factor_(dp_to_px),
@@ -319,4 +319,5 @@ cc::LayerSettings BlimpCompositor::LayerSettings() {
return settings;
}
+} // namespace client
} // namespace blimp
« no previous file with comments | « blimp/client/compositor/blimp_compositor.h ('k') | blimp/client/compositor/blimp_compositor_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698