| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index ad10a139671945e4f16e73f7f8b1c3b818a32cce..daf9c1a6ded9ff3bbd95b4db29ea77acf6a76aa8 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -10,10 +10,10 @@
|
| #include "base/debug/trace_event.h"
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/base/scoped_ptr_algorithm.h"
|
| #include "cc/content_layer.h"
|
| #include "cc/delegated_frame_data.h"
|
| #include "cc/delegated_renderer_layer.h"
|
| -#include "cc/scoped_ptr_algorithm.h"
|
| #include "cc/solid_color_layer.h"
|
| #include "cc/texture_layer.h"
|
| #include "cc/transferable_resource.h"
|
| @@ -26,8 +26,8 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/display.h"
|
| #include "ui/gfx/interpolated_transform.h"
|
| -#include "ui/gfx/point_conversions.h"
|
| #include "ui/gfx/point3_f.h"
|
| +#include "ui/gfx/point_conversions.h"
|
| #include "ui/gfx/size_conversions.h"
|
|
|
| namespace {
|
|
|