Removes/promotes functions from WmWindowMus to WmWindowAura

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 330 matching lines @@
   NOTREACHED();
 }
 
 int WmWindowAura::GetIntProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::MODAL_TYPE)
     return window_->GetProperty(aura::client::kModalKey);
 
   if (key == WmWindowProperty::SHELF_ID)
     return window_->GetProperty(kShelfIDKey);
 
-  if (key == WmWindowProperty::SHELF_ITEM_TYPE)
-    return window_->GetProperty(kShelfItemTypeKey);
+  if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
+    if (aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL ||
+        aura_window()->GetProperty(kShelfItemTypeKey) != TYPE_UNDEFINED) {

[James Cook, 2017/01/05 23:16:47]

nit: just use |window_| here and below for consistency

[sky, 2017/01/05 23:30:54]

Done.

+      return aura_window()->GetProperty(kShelfItemTypeKey);
+    }
+    // Mash provides a default shelf item type for non-ignored windows.
+    return GetWindowState()->ignored_by_shelf() ? TYPE_UNDEFINED : TYPE_APP;
+  }
 
   if (key == WmWindowProperty::TOP_VIEW_INSET)
     return window_->GetProperty(aura::client::kTopViewInset);
 
   NOTREACHED();
   return 0;
 }
 
 void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
   if (key == WmWindowProperty::SHELF_ID) {
@@ skipping 290 matching lines @@
   return (window_->GetProperty(aura::client::kResizeBehaviorKey) &
           ui::mojom::kResizeBehaviorCanMinimize) != 0;
 }
 
 bool WmWindowAura::CanResize() const {
   return (window_->GetProperty(aura::client::kResizeBehaviorKey) &
           ui::mojom::kResizeBehaviorCanResize) != 0;
 }
 
 bool WmWindowAura::CanActivate() const {
+  // TODO(sky): for aura-mus need to key off CanFocus() as well, which is not
+  // currently mirrored to ash.
   return ::wm::CanActivateWindow(window_);
 }
 
 void WmWindowAura::StackChildAtTop(WmWindow* child) {
   window_->StackChildAtTop(GetAuraWindow(child));
 }
 
 void WmWindowAura::StackChildAtBottom(WmWindow* child) {
   window_->StackChildAtBottom(GetAuraWindow(child));
 }
 
 void WmWindowAura::StackChildAbove(WmWindow* child, WmWindow* target) {
   window_->StackChildAbove(GetAuraWindow(child), GetAuraWindow(target));
 }
 
 void WmWindowAura::StackChildBelow(WmWindow* child, WmWindow* target) {
   window_->StackChildBelow(GetAuraWindow(child), GetAuraWindow(target));
 }
 
 void WmWindowAura::SetPinned(bool trusted) {
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
+    // TODO: fix, see http://crbug.com/622486. With aura-mus pinning may just
+    // work.
+    NOTIMPLEMENTED();
+    return;
+  }
   wm::PinWindow(window_, trusted);
 }
 
 void WmWindowAura::SetAlwaysOnTop(bool value) {
   window_->SetProperty(aura::client::kAlwaysOnTopKey, value);
 }
 
 bool WmWindowAura::IsAlwaysOnTop() const {
   return window_->GetProperty(aura::client::kAlwaysOnTopKey);
 }
@@ skipping 59 matching lines @@
 
 std::vector<WmWindow*> WmWindowAura::GetChildren() {
   return FromAuraWindows(window_->children());
 }
 
 WmWindow* WmWindowAura::GetChildByShellWindowId(int id) {
   return Get(window_->GetChildById(id));
 }
 
 void WmWindowAura::ShowResizeShadow(int component) {
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
+    // TODO: http://crbug.com/640773.
+    return;
+  }
   ResizeShadowController* resize_shadow_controller =
       Shell::GetInstance()->resize_shadow_controller();
   if (resize_shadow_controller)
     resize_shadow_controller->ShowShadow(window_, component);
 }
 
 void WmWindowAura::HideResizeShadow() {
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
+    // TODO: http://crbug.com/640773.
+    return;
+  }
   ResizeShadowController* resize_shadow_controller =
       Shell::GetInstance()->resize_shadow_controller();
   if (resize_shadow_controller)
     resize_shadow_controller->HideShadow(window_);
 }
 
 void WmWindowAura::InstallResizeHandleWindowTargeter(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS) {
+    // TODO(sky): I believe once ImmersiveFullscreenController is ported this
+    // won't be necessary in mash, but I need to verify that:
+    // http://crbug.com/548435.
+    return;
+  }
   window_->SetEventTargeter(base::MakeUnique<ResizeHandleWindowTargeter>(
       window_, immersive_fullscreen_controller));
 }
 
 void WmWindowAura::SetBoundsInScreenBehaviorForChildren(
     BoundsInScreenBehavior behavior) {
   window_->SetProperty(
       kUsesScreenCoordinatesKey,
       behavior == BoundsInScreenBehavior::USE_SCREEN_COORDINATES);
 }
@@ skipping 180 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