Revert of Window prerequisites for ShelfWindowWatcher panel support.

ash/common/wm_window.h

 // 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.
 
 #ifndef ASH_COMMON_WM_WINDOW_H_
 #define ASH_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_animation_element.h"
-#include "ui/gfx/image/image_skia.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Point;
 class Rect;
@@ skipping 103 matching lines @@
   virtual void SetTransform(const gfx::Transform& transform) = 0;
   virtual gfx::Transform GetTargetTransform() const = 0;
 
   virtual bool IsSystemModal() const = 0;
 
   virtual bool GetBoolProperty(WmWindowProperty key) = 0;
   virtual SkColor GetColorProperty(WmWindowProperty key) = 0;
   virtual void SetColorProperty(WmWindowProperty key, SkColor value) = 0;
   virtual int GetIntProperty(WmWindowProperty key) = 0;
   virtual void SetIntProperty(WmWindowProperty key, int value) = 0;
-  virtual std::string GetStringProperty(WmWindowProperty key) = 0;
-  virtual void SetStringProperty(WmWindowProperty key,
-                                 const std::string& value) = 0;
-
-  virtual gfx::ImageSkia GetWindowIcon() = 0;
-  virtual gfx::ImageSkia GetAppIcon() = 0;
 
   wm::WindowState* GetWindowState() {
     return const_cast<wm::WindowState*>(
         const_cast<const WmWindow*>(this)->GetWindowState());
   }
   virtual const wm::WindowState* GetWindowState() const = 0;
 
   // The implementation of this matches aura::Window::GetToplevelWindow().
   virtual WmWindow* GetToplevelWindow() = 0;
   // The implementation of this matches
@@ skipping 12 matching lines @@
   }
   virtual const WmWindow* GetParent() const = 0;
 
   WmWindow* GetTransientParent() {
     return const_cast<WmWindow*>(
         const_cast<const WmWindow*>(this)->GetTransientParent());
   }
   virtual const WmWindow* GetTransientParent() const = 0;
   virtual Windows GetTransientChildren() = 0;
 
-  // Moves this to the display where |event| occurred; returns true if moved.
-  virtual bool MoveToEventRoot(const ui::Event& event) = 0;
-
   virtual void SetLayoutManager(
       std::unique_ptr<WmLayoutManager> layout_manager) = 0;
   virtual WmLayoutManager* GetLayoutManager() = 0;
 
   // See wm::SetWindowVisibilityChangesAnimated() for details on what this
   // does.
   virtual void SetVisibilityChangesAnimated() = 0;
   // |type| is WindowVisibilityAnimationType. Has to be an int to match aura.
   virtual void SetVisibilityAnimationType(int type) = 0;
   virtual void SetVisibilityAnimationDuration(base::TimeDelta delta) = 0;
@@ skipping 148 matching lines @@
   virtual void AddLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
   virtual void RemoveLimitedPreTargetHandler(ui::EventHandler* handler) = 0;
 
  protected:
   virtual ~WmWindow() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WINDOW_H_