Converts mash to use the common non-client frame

ui/views/mus/native_widget_mus.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 684 matching lines @@
 
   focus_client_.reset(
       new FocusControllerMus(new FocusRulesImpl(hosted_window)));
 
   aura::client::SetFocusClient(hosted_window, focus_client_.get());
   aura::client::SetActivationClient(hosted_window, focus_client_.get());
   screen_position_client_.reset(new ScreenPositionClientMus(window_));
   aura::client::SetScreenPositionClient(hosted_window,
                                         screen_position_client_.get());
 
-  // TODO(erg): Remove this check when ash/mus/frame/move_event_handler.cc's
+  // TODO(erg): Remove this check when ash/mus/move_event_handler.cc's
   // direct usage of ui::Window::SetPredefinedCursor() is switched to a
   // private method on WindowManagerClient.
   if (!is_parallel_widget_in_window_manager()) {
     cursor_manager_.reset(new wm::CursorManager(
         base::WrapUnique(new NativeCursorManagerMus(window_))));
     aura::client::SetCursorClient(hosted_window, cursor_manager_.get());
   }
 
   window_tree_client_.reset(new NativeWidgetMusWindowTreeClient(hosted_window));
   hosted_window->AddPreTargetHandler(focus_client_.get());
@@ skipping 319 matching lines @@
     window_->window_tree()->ClearFocus();
 }
 
 bool NativeWidgetMus::IsActive() const {
   ui::Window* focused =
       window_ ? window_->window_tree()->GetFocusedWindow() : nullptr;
   return focused && window_->Contains(focused);
 }
 
 void NativeWidgetMus::SetAlwaysOnTop(bool always_on_top) {
-  if (window_) {
+  if (window_ && !is_parallel_widget_in_window_manager()) {
     window_->SetSharedProperty<bool>(
         ui::mojom::WindowManager::kAlwaysOnTop_Property, always_on_top);
   }
 }
 
 bool NativeWidgetMus::IsAlwaysOnTop() const {
   return window_ &&
          window_->HasSharedProperty(
              ui::mojom::WindowManager::kAlwaysOnTop_Property) &&
          window_->GetSharedProperty<bool>(
@@ skipping 378 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views