Revert of Window prerequisites for ShelfWindowWatcher panel support.

ash/aura/wm_window_aura.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 "ash/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_root_window_controller_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
@@ skipping 274 matching lines @@
 gfx::Transform WmWindowAura::GetTargetTransform() const {
   return window_->layer()->GetTargetTransform();
 }
 
 bool WmWindowAura::IsSystemModal() const {
   return window_->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_SYSTEM;
 }
 
 bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
   switch (key) {
-    case WmWindowProperty::DRAW_ATTENTION:
-      return window_->GetProperty(aura::client::kDrawAttentionKey);
-
     case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY:
       return window_->GetProperty(kSnapChildrenToPixelBoundary);
 
     case WmWindowProperty::ALWAYS_ON_TOP:
       return window_->GetProperty(aura::client::kAlwaysOnTopKey);
 
     case WmWindowProperty::EXCLUDE_FROM_MRU:
       return window_->GetProperty(aura::client::kExcludeFromMruKey);
 
     default:
@@ skipping 55 matching lines @@
     return;
   }
   if (key == WmWindowProperty::TOP_VIEW_INSET) {
     window_->SetProperty(aura::client::kTopViewInset, value);
     return;
   }
 
   NOTREACHED();
 }
 
-std::string WmWindowAura::GetStringProperty(WmWindowProperty key) {
-  if (key == WmWindowProperty::APP_ID) {
-    std::string* value = window_->GetProperty(aura::client::kAppIdKey);
-    return value ? *value : std::string();
-  }
-
-  NOTREACHED();
-  return std::string();
-}
-
-void WmWindowAura::SetStringProperty(WmWindowProperty key,
-                                     const std::string& value) {
-  if (key == WmWindowProperty::APP_ID) {
-    window_->SetProperty(aura::client::kAppIdKey, new std::string(value));
-    return;
-  }
-
-  NOTREACHED();
-}
-
-gfx::ImageSkia WmWindowAura::GetWindowIcon() {
-  gfx::ImageSkia* image = window_->GetProperty(aura::client::kWindowIconKey);
-  return image ? *image : gfx::ImageSkia();
-}
-
-gfx::ImageSkia WmWindowAura::GetAppIcon() {
-  gfx::ImageSkia* image = window_->GetProperty(aura::client::kAppIconKey);
-  return image ? *image : gfx::ImageSkia();
-}
-
 const wm::WindowState* WmWindowAura::GetWindowState() const {
   return ash::wm::GetWindowState(window_);
 }
 
 WmWindow* WmWindowAura::GetToplevelWindow() {
   return Get(window_->GetToplevelWindow());
 }
 
 WmWindow* WmWindowAura::GetToplevelWindowForFocus() {
   return Get(::wm::GetToplevelWindow(window_));
@@ skipping 18 matching lines @@
 }
 
 const WmWindow* WmWindowAura::GetTransientParent() const {
   return Get(::wm::GetTransientParent(window_));
 }
 
 std::vector<WmWindow*> WmWindowAura::GetTransientChildren() {
   return FromAuraWindows(::wm::GetTransientChildren(window_));
 }
 
-bool WmWindowAura::MoveToEventRoot(const ui::Event& event) {
-  return ash::wm::MoveWindowToEventRoot(window_, event);
-}
-
 void WmWindowAura::SetLayoutManager(
     std::unique_ptr<WmLayoutManager> layout_manager) {
   // See ~AuraLayoutManagerAdapter for why SetLayoutManager(nullptr) is called.
   window_->SetLayoutManager(nullptr);
   if (!layout_manager)
     return;
 
   // |window_| takes ownership of AuraLayoutManagerAdapter.
   window_->SetLayoutManager(
       new AuraLayoutManagerAdapter(window_, std::move(layout_manager)));
@@ skipping 414 matching lines @@
 void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
                                            const void* key,
                                            intptr_t old) {
   if (key == aura::client::kShowStateKey) {
     ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
     return;
   }
   WmWindowProperty wm_property;
   if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
-  } else if (key == aura::client::kAppIconKey) {
-    wm_property = WmWindowProperty::APP_ICON;
-  } else if (key == aura::client::kDrawAttentionKey) {
-    wm_property = WmWindowProperty::DRAW_ATTENTION;
   } else if (key == aura::client::kExcludeFromMruKey) {
     wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
   } else if (key == aura::client::kModalKey) {
     wm_property = WmWindowProperty::MODAL_TYPE;
   } else if (key == kShelfIconResourceIdKey) {
     wm_property = WmWindowProperty::SHELF_ICON_RESOURCE_ID;
   } else if (key == kShelfIDKey) {
     wm_property = WmWindowProperty::SHELF_ID;
   } else if (key == kShelfItemTypeKey) {
     wm_property = WmWindowProperty::SHELF_ITEM_TYPE;
   } else if (key == kSnapChildrenToPixelBoundary) {
     wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY;
   } else if (key == aura::client::kTopViewInset) {
     wm_property = WmWindowProperty::TOP_VIEW_INSET;
-  } else if (key == aura::client::kWindowIconKey) {
-    wm_property = WmWindowProperty::WINDOW_ICON;
   } else {
     return;
   }
   for (auto& observer : observers_)
     observer.OnWindowPropertyChanged(this, wm_property);
 }
 
 void WmWindowAura::OnWindowBoundsChanged(aura::Window* window,
                                          const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
@@ skipping 35 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash