Update SetPaintToLayer to accept LayerType

chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc

 // Copyright 2016 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 "chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 426 matching lines @@
   tap_label_->SetDisabledColor(kTapHereLabelColor);
   tap_label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
   tap_label_->SetAutoColorReadabilityEnabled(false);
   tap_label_->SetSubpixelRenderingEnabled(false);
   tap_label_->SetVisible(false);
 
   touch_point_view_ = new views::View;
   touch_point_view_->SetBounds(kTouchPointViewOffset, kTouchPointViewOffset,
                                kTapLabelWidth, kTouchPointViewHeight);
   touch_point_view_->SetVisible(false);
-  touch_point_view_->SetPaintToLayer(true);
+  touch_point_view_->SetPaintToLayer(ui::LAYER_TEXTURED);
   touch_point_view_->layer()->SetFillsBoundsOpaquely(false);
   touch_point_view_->layer()->GetAnimator()->AddObserver(this);
   touch_point_view_->set_background(
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
 
   touch_point_view_->AddChildView(throbber_circle_);
   touch_point_view_->AddChildView(tap_label_);
 
   AddChildView(touch_point_view_);
 
@@ skipping 25 matching lines @@
   base::string16 finish_msg_text =
       rb.GetLocalizedString(IDS_DISPLAY_TOUCH_CALIBRATION_FINISH_LABEL);
 
   gfx::Rect msg_view_bounds(
       (display_.bounds().width() - kCompleteMessageViewWidth) / 2,
       display_.bounds().height() / 3, kCompleteMessageViewWidth,
       kCompleteMessageViewHeight);
   completion_message_view_ =
       new CompletionMessageView(msg_view_bounds, finish_msg_text);
   completion_message_view_->SetVisible(false);
-  completion_message_view_->SetPaintToLayer(true);
+  completion_message_view_->SetPaintToLayer(ui::LAYER_TEXTURED);
   completion_message_view_->layer()->SetFillsBoundsOpaquely(false);
   completion_message_view_->layer()->GetAnimator()->AddObserver(this);
   completion_message_view_->set_background(
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
 
   AddChildView(completion_message_view_);
 }
 
 void TouchCalibratorView::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
@@ skipping 201 matching lines @@
 void TouchCalibratorView::SkipCurrentAnimation() {
   if (animator_->is_animating())
     animator_->End();
   if (touch_point_view_ &&
       touch_point_view_->layer()->GetAnimator()->is_animating()) {
     touch_point_view_->layer()->GetAnimator()->StopAnimating();
   }
 }
 
 }  // namespace chromeos