Makes Panel related classes use ash/wm/common types

ash/wm/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/wm/aura/wm_window_aura.h"
 
 #include "ash/screen_util.h"
+#include "ash/shelf/shelf_util.h"
 #include "ash/wm/aura/aura_layout_manager_adapter.h"
 #include "ash/wm/aura/wm_globals_aura.h"
 #include "ash/wm/aura/wm_root_window_controller_aura.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/common/wm_window_property.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
@@ skipping 176 matching lines @@
   return window_->IsVisible();
 }
 
 bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
   switch (key) {
     case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUDARY:
       return window_->GetProperty(kSnapChildrenToPixelBoundary);
 
     case WmWindowProperty::ALWAYS_ON_TOP:
       return window_->GetProperty(aura::client::kAlwaysOnTopKey);
+
+    default:
+      NOTREACHED();
+      break;
   }
 
+  return false;
+}
+
+int WmWindowAura::GetIntProperty(WmWindowProperty key) {
+  if (key == WmWindowProperty::SHELF_ID)
+    return GetShelfIDForWindow(window_);
+
   NOTREACHED();
-  return false;
+  return 0;
 }
 
 const WindowState* WmWindowAura::GetWindowState() const {
   return ash::wm::GetWindowState(window_);
 }
 
 WmWindow* WmWindowAura::GetToplevelWindow() {
   return Get(window_->GetToplevelWindow());
 }
 
@@ skipping 299 matching lines @@
                                            intptr_t old) {
   if (key == aura::client::kShowStateKey) {
     ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
     return;
   }
   WmWindowProperty wm_property;
   if (key == kSnapChildrenToPixelBoundary) {
     wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUDARY;
   } else if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
+  } else if (key == kShelfID) {
+    wm_property = WmWindowProperty::SHELF_ID;
   } else {
     return;
   }
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowPropertyChanged(this, wm_property, old));
 }
 
 void WmWindowAura::OnWindowBoundsChanged(aura::Window* window,
                                          const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowBoundsChanged(this, old_bounds, new_bounds));
 }
 
 void WmWindowAura::OnWindowDestroying(aura::Window* window) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this));
 }
 
 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window,
                                               bool visible) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowVisibilityChanging(this, visible));
 }
 
 }  // namespace wm
 }  // namespace ash