Revert of Window prerequisites for ShelfWindowWatcher panel support.

ui/views/mus/desktop_window_tree_host_mus.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 "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace views {
 
 DesktopWindowTreeHostMus::DesktopWindowTreeHostMus(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura)
     : aura::WindowTreeHostMus(MusClient::Get()->window_tree_client()),
@@ skipping 270 matching lines @@
          ui::SHOW_STATE_FULLSCREEN;
 }
 void DesktopWindowTreeHostMus::SetOpacity(float opacity) {
   // TODO: this likely need to go to server so that non-client decorations get
   // opacity.
   window()->layer()->SetOpacity(opacity);
 }
 
 void DesktopWindowTreeHostMus::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                               const gfx::ImageSkia& app_icon) {
-  NativeWidgetAura::AssignIconToAuraWindow(window(), window_icon, app_icon);
+  if (window_icon.isNull() && app_icon.isNull()) {
+    window()->ClearProperty(aura::client::kWindowIconKey);
+    return;
+  }
+
+  window()->SetProperty(
+      aura::client::kWindowIconKey,
+      new gfx::ImageSkia(!window_icon.isNull() ? window_icon : app_icon));
 }
 
 void DesktopWindowTreeHostMus::InitModalType(ui::ModalType modal_type) {
   window()->SetProperty(aura::client::kModalKey, modal_type);
 }
 
 void DesktopWindowTreeHostMus::FlashFrame(bool flash_frame) {
   window()->SetProperty(aura::client::kDrawAttentionKey, flash_frame);
 }
 
@@ skipping 11 matching lines @@
   Widget* widget = native_widget_delegate_->AsWidget();
   window()->SetProperty(aura::client::kCanMaximizeKey,
                         widget->widget_delegate()->CanMaximize());
   window()->SetProperty(aura::client::kCanMinimizeKey,
                         widget->widget_delegate()->CanMinimize());
   window()->SetProperty(aura::client::kCanResizeKey,
                         widget->widget_delegate()->CanResize());
 }
 
 }  // namespace views