Makes Window::Init take a WindowLayerType instead of LayerType.

ui/aura/window.cc

 // Copyright (c) 2012 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 "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 22 matching lines @@
 #include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 
 namespace {
 
-WindowLayerType UILayerTypeToWindowLayerType(ui::LayerType layer_type) {
-  switch (layer_type) {
-    case ui::LAYER_NOT_DRAWN:
-      return WINDOW_LAYER_NOT_DRAWN;
-    case ui::LAYER_TEXTURED:
-      return WINDOW_LAYER_TEXTURED;
-    case ui::LAYER_SOLID_COLOR:
-      return WINDOW_LAYER_SOLID_COLOR;
-  }
-  NOTREACHED();
-  return WINDOW_LAYER_NOT_DRAWN;
-}
-
 ui::LayerType WindowLayerTypeToUILayerType(WindowLayerType window_layer_type) {
   switch (window_layer_type) {
     case WINDOW_LAYER_NONE:
       break;
     case WINDOW_LAYER_NOT_DRAWN:
       return ui::LAYER_NOT_DRAWN;
     case WINDOW_LAYER_TEXTURED:
       return ui::LAYER_TEXTURED;
     case WINDOW_LAYER_SOLID_COLOR:
       return ui::LAYER_SOLID_COLOR;
@@ skipping 206 matching lines @@
 
   // If we have layer it will either be destroyed by |layer_owner_|'s dtor, or
   // by whoever acquired it. We don't have a layer if Init() wasn't invoked or
   // we are layerless.
   if (layer_) {
     layer_->set_delegate(NULL);
     layer_ = NULL;
   }
 }
 
-void Window::Init(ui::LayerType layer_type) {
-  InitWithWindowLayerType(UILayerTypeToWindowLayerType(layer_type));
-}
-
-void Window::InitWithWindowLayerType(WindowLayerType window_layer_type) {
+void Window::Init(WindowLayerType window_layer_type) {
   if (window_layer_type != WINDOW_LAYER_NONE) {
     layer_ = new ui::Layer(WindowLayerTypeToUILayerType(window_layer_type));
     layer_owner_.reset(layer_);
     layer_->SetVisible(false);
     layer_->set_delegate(this);
     UpdateLayerName(name_);
     layer_->SetFillsBoundsOpaquely(!transparent_);
   }
 
   Env::GetInstance()->NotifyWindowInitialized(this);
@@ skipping 1155 matching lines @@
       return window;
     if (offset)
       *offset += window->bounds().OffsetFromOrigin();
   }
   if (offset)
     *offset = gfx::Vector2d();
   return NULL;
 }
 
 }  // namespace aura