Add WindowPinType property on arua::Window

ash/common/wm/window_state.cc

Index: ash/common/wm/window_state.cc
diff --git a/ash/common/wm/window_state.cc b/ash/common/wm/window_state.cc
index dc42f68c2e1e9aebac99b76eab6ff27f08108e66..9f140ef160220e201117c60631fd8b5fe26f0884 100644
--- a/ash/common/wm/window_state.cc
+++ b/ash/common/wm/window_state.cc
@@ -13,7 +13,10 @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_window.h"
+#include "ash/public/cpp/window_properties.h"
+#include "ash/public/interfaces/window_pin_type.mojom.h"
 #include "base/auto_reset.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 namespace wm {
@@ -41,6 +44,19 @@ WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) {
   return WM_EVENT_NORMAL;
 }
 
+WMEventType WMEventTypeFromWindowPinType(ash::mojom::WindowPinType type) {
+  switch (type) {
+    case ash::mojom::WindowPinType::NONE:
+      return WM_EVENT_NORMAL;
+    case ash::mojom::WindowPinType::PINNED:
+      return WM_EVENT_PIN;
+    case ash::mojom::WindowPinType::TRUSTED_PINNED:
+      return WM_EVENT_TRUSTED_PIN;
+  }
+  NOTREACHED() << "No WMEvent defined for the window pin type:" << type;
+  return WM_EVENT_NORMAL;
+}
+
 }  // namespace
 
 WindowState::~WindowState() {}
@@ -286,6 +302,13 @@ void WindowState::OnWindowShowStateChanged() {
   }
 }
 
+void WindowState::OnWindowPinTypeChanged() {
+  if (!ignore_property_change_) {
+    WMEvent event(WMEventTypeFromWindowPinType(GetPinType()));
+    OnWMEvent(&event);
+  }
+}
+
 WindowState::WindowState(WmWindow* window)
     : window_(window),
       window_position_managed_(false),
@@ -310,6 +333,10 @@ ui::WindowShowState WindowState::GetShowState() const {
   return window_->GetShowState();
 }
 
+ash::mojom::WindowPinType WindowState::GetPinType() const {
+  return window_->aura_window()->GetProperty(kWindowPinTypeKey);
+}
+
 void WindowState::SetBoundsInScreen(const gfx::Rect& bounds_in_screen) {
   gfx::Rect bounds_in_parent =
       window_->GetParent()->ConvertRectFromScreen(bounds_in_screen);
@@ -328,13 +355,24 @@ void WindowState::AdjustSnappedBounds(gfx::Rect* bounds) {
   bounds->set_height(maximized_bounds.height());
 }
 
-void WindowState::UpdateWindowShowStateFromStateType() {
+void WindowState::UpdateWindowPropertiesFromStateType() {
   ui::WindowShowState new_window_state =
       ToWindowShowState(current_state_->GetType());
   if (new_window_state != GetShowState()) {
     base::AutoReset<bool> resetter(&ignore_property_change_, true);
     window_->SetShowState(new_window_state);
   }
+
+  // sync up current window show state with PinType property.
+  ash::mojom::WindowPinType pin_type = ash::mojom::WindowPinType::NONE;

[dcheng, 2017/04/04 06:58:54]

After seeing this and the conversion on line 47, I'm wondering why we bother
with the mojo type at all. Conversions should ideally be typemapped to
centralize the logic... and this isn't doing that.

[Peng, 2017/04/04 15:08:14]

The function (on line 47) is for converting the mojom window pin type to a
window manager event. I fully understand what is your suggestion.

+  if (GetStateType() == WINDOW_STATE_TYPE_PINNED)
+    pin_type = ash::mojom::WindowPinType::PINNED;
+  else if (GetStateType() == WINDOW_STATE_TYPE_TRUSTED_PINNED)
+    pin_type = ash::mojom::WindowPinType::TRUSTED_PINNED;
+  if (pin_type != GetPinType()) {
+    base::AutoReset<bool> resetter(&ignore_property_change_, true);
+    window_->aura_window()->SetProperty(kWindowPinTypeKey, pin_type);
+  }
 }
 
 void WindowState::NotifyPreStateTypeChange(