Use Widget::InitParams::shadow_type instead of calling wm::SetShadowType.

chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

 // Copyright 2014 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/ui/views/apps/chrome_native_app_window_views.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
@@ skipping 10 matching lines @@
 #include "components/ui/zoom/zoom_controller.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
-#include "ui/wm/core/shadow_types.h"
 
 #if defined(OS_LINUX)
 #include "chrome/browser/shell_integration_linux.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/screen_util.h"
@@ skipping 168 matching lines @@
 
 void ChromeNativeAppWindowViews::InitializeDefaultWindow(
     const AppWindow::CreateParams& create_params) {
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
       app_window()->extension_id());
 
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
   init_params.remove_standard_frame = IsFrameless() || has_frame_color_;
   init_params.use_system_default_icon = true;
-  if (create_params.alpha_enabled)
+  if (create_params.alpha_enabled) {
     init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+
+    // The given window is most likely not rectangular since it uses
+    // transparency and has no standard frame, don't show a shadow for it.
+    // TODO(skuhne): If we run into an application which should have a shadow
+    // but does not have, a new attribute has to be added.
+    if (IsFrameless())
+      init_params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
+  }
   init_params.keep_on_top = create_params.always_on_top;
   init_params.visible_on_all_workspaces =
       create_params.visible_on_all_workspaces;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Set up a custom WM_CLASS for app windows. This allows task switchers in
   // X11 environments to distinguish them from main browser windows.
   init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);
   init_params.wm_class_class = shell_integration_linux::GetProgramClassName();
   const char kX11WindowRoleApp[] = "app";
@@ skipping 21 matching lines @@
     typedef AppWindow::BoundsSpecification BoundsSpecification;
     bool position_specified =
         window_bounds.x() != BoundsSpecification::kUnspecifiedPosition &&
         window_bounds.y() != BoundsSpecification::kUnspecifiedPosition;
     if (!position_specified)
       widget()->CenterWindow(window_bounds.size());
     else
       widget()->SetBounds(window_bounds);
   }
 
-  if (IsFrameless() &&
-      init_params.opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW) {
-    // The given window is most likely not rectangular since it uses
-    // transparency and has no standard frame, don't show a shadow for it.
-    // TODO(skuhne): If we run into an application which should have a shadow
-    // but does not have, a new attribute has to be added.
-    wm::SetShadowType(widget()->GetNativeWindow(), wm::SHADOW_TYPE_NONE);
-  }
-
 #if defined(OS_CHROMEOS)
   if (create_params.is_ime_window)
     return;
 #endif
 
   // Register accelarators supported by app windows.
   // TODO(jeremya/stevenjb): should these be registered for panels too?
   views::FocusManager* focus_manager = GetFocusManager();
   const std::map<ui::Accelerator, int>& accelerator_table =
       GetAcceleratorTable();
@@ skipping 424 matching lines @@
     // Add the EasyResizeWindowTargeter on the window, not its root window. The
     // root window does not have a delegate, which is needed to handle the event
     // in Linux.
     window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
         new wm::EasyResizeWindowTargeter(window, inset, inset)));
   }
 #endif
 
   return frame;
 }