aura: Add Layer::LAYER_SOLID_COLOR to compositor.

ash/wm/image_grid.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/image_grid.h"
 
 #include <algorithm>
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ skipping 30 matching lines @@
 
 void ImageGrid::Init(const gfx::Image* top_left_image,
                      const gfx::Image* top_image,
                      const gfx::Image* top_right_image,
                      const gfx::Image* left_image,
                      const gfx::Image* center_image,
                      const gfx::Image* right_image,
                      const gfx::Image* bottom_left_image,
                      const gfx::Image* bottom_image,
                      const gfx::Image* bottom_right_image) {
-  layer_.reset(new ui::Layer(ui::Layer::LAYER_HAS_NO_TEXTURE));
+  layer_.reset(new ui::Layer(ui::Layer::LAYER_NOT_DRAWN));
 
   InitImage(top_left_image, &top_left_layer_, &top_left_painter_);
   InitImage(top_image, &top_layer_, &top_painter_);
   InitImage(top_right_image, &top_right_layer_, &top_right_painter_);
   InitImage(left_image, &left_layer_, &left_painter_);
   InitImage(center_image, &center_layer_, &center_painter_);
   InitImage(right_image, &right_layer_, &right_painter_);
   InitImage(bottom_left_image, &bottom_left_layer_, &bottom_left_painter_);
   InitImage(bottom_image, &bottom_layer_, &bottom_painter_);
   InitImage(bottom_right_image, &bottom_right_layer_, &bottom_right_painter_);
@@ skipping 161 matching lines @@
   return layer->bounds().width() > size.width() ||
       layer->bounds().height() > size.height();
 }
 
 void ImageGrid::InitImage(const gfx::Image* image,
                           scoped_ptr<ui::Layer>* layer_ptr,
                           scoped_ptr<ImagePainter>* painter_ptr) {
   if (!image)
     return;
 
-  layer_ptr->reset(new ui::Layer(ui::Layer::LAYER_HAS_TEXTURE));
+  layer_ptr->reset(new ui::Layer(ui::Layer::LAYER_TEXTURED));
 
   const gfx::Size size = GetImageSize(image);
   layer_ptr->get()->SetBounds(gfx::Rect(0, 0, size.width(), size.height()));
 
   painter_ptr->reset(new ImagePainter(image));
   layer_ptr->get()->set_delegate(painter_ptr->get());
   layer_ptr->get()->SetFillsBoundsOpaquely(false);
   layer_ptr->get()->SetVisible(true);
   layer_->Add(layer_ptr->get());
 }
 
 }  // namespace internal
 }  // namespace ash