| 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
|
|
|