Fixes a couple of bugs in NativeWidgetMus

ui/views/mus/native_widget_mus.h

 // 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.
 
 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 214 matching lines @@
 
  private:
   friend class NativeWidgetMusTest;
   class MusWindowObserver;
   class MusCaptureClient;
 
   ui::PlatformWindowDelegate* platform_window_delegate() {
     return window_tree_host();
   }
 
+  // Returns true if this NativeWidgetMus exists on the window manager side
+  // to provide the frame decorations.
+  bool is_parallel_widget_in_window_manager() {
+    return is_parallel_widget_in_window_manager_;
+  }
+
   void set_last_cursor(ui::mojom::Cursor cursor) { last_cursor_ = cursor; }
   void SetShowState(ui::mojom::ShowState show_state);
 
   void OnMusWindowVisibilityChanging(ui::Window* window);
   void OnMusWindowVisibilityChanged(ui::Window* window);
 
   // Propagates the widget hit test mask, if any, to the ui::Window.
   // TODO(jamescook): Wire this through views::Widget so widgets can push
   // updates if needed.
   void UpdateHitTestMask();
 
   ui::Window* window_;
   ui::mojom::Cursor last_cursor_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
-  const ui::mojom::SurfaceType surface_type_;
+  const bool is_parallel_widget_in_window_manager_;
   ui::mojom::ShowState show_state_before_fullscreen_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   // Functions with the same name require the ui::WindowObserver to be in
   // a separate class.
   std::unique_ptr<MusWindowObserver> mus_window_observer_;
 
   // This is misnamed; The native widget interface offers something called
@@ skipping 12 matching lines @@
   std::unique_ptr<wm::CursorManager> cursor_manager_;
 
   base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_