Add WindowPinType property on arua::Window

components/exo/shell_surface.cc

 // Copyright 2015 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 "components/exo/shell_surface.h"
 
 #include <algorithm>
 
 #include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/public/cpp/window_properties.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/surface.h"
@@ skipping 459 matching lines @@
 void ShellSurface::SetPinned(bool pinned, bool trusted) {
   TRACE_EVENT2("exo", "ShellSurface::SetPinned", "pinned", pinned, "trusted",
                trusted);
 
   if (!widget_)
     CreateShellSurfaceWidget(ui::SHOW_STATE_NORMAL);
 
   // Note: This will ask client to configure its surface even if pinned
   // state doesn't change.
   ScopedConfigure scoped_configure(this, true);
   if (pinned) {

[sky, 2017/04/03 16:38:56]

Maybe move the determining of type to a function so that this becomes:

widget_->GetNativeWindow()->SetProperty(ash::kWindowPinTypeKey,
GetPinType(pinned, trusted));

[Peng, 2017/04/03 18:03:48]

Done.

-    ash::wm::PinWindow(widget_->GetNativeWindow(), trusted);
+    ash::WindowPinType pin_type = trusted ? ash::WindowPinType::TRUSTED_PINNED
+                                          : ash::WindowPinType::PINNED;
+    widget_->GetNativeWindow()->SetProperty(ash::kWindowPinTypeKey, pin_type);
   } else {
     // At the moment, we cannot just unpin the window state, due to ash
     // implementation. Instead, we call Restore() to unpin, if it is Pinned
     // state. In this implementation, we may loose the previous state,
     // if the previous state is fullscreen, etc.
-    if (ash::wm::GetWindowState(widget_->GetNativeWindow())->IsPinned())
-      widget_->Restore();
+    widget_->GetNativeWindow()->SetProperty(ash::kWindowPinTypeKey,
+                                            ash::WindowPinType::NONE);
   }
 }
 
 void ShellSurface::SetSystemUiVisibility(bool autohide) {
   TRACE_EVENT1("exo", "ShellSurface::SetSystemUiVisibility", "autohide",
                autohide);
   ash::wm::SetAutoHideShelf(widget_->GetNativeWindow(), autohide);
 }
 
 void ShellSurface::SetTitle(const base::string16& title) {
@@ skipping 1191 matching lines @@
 gfx::Point ShellSurface::GetMouseLocation() const {
   aura::Window* const root_window = widget_->GetNativeWindow()->GetRootWindow();
   gfx::Point location =
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot();
   aura::Window::ConvertPointToTarget(
       root_window, widget_->GetNativeWindow()->parent(), &location);
   return location;
 }
 
 }  // namespace exo