Random wm frame painting fixes

mash/wm/frame/non_client_frame_view_mash.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 MASH_WM_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
 #define MASH_WM_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/window_observer.h"
+#include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/paint_cache.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace gfx {
 class Insets;
 }
 
 namespace mus {
 class Window;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace mash {
 namespace wm {
 
 class FrameCaptionButtonContainerView;
 
 class NonClientFrameViewMash : public views::NonClientFrameView,
-                               public mus::WindowObserver {
+                               public mus::WindowObserver,
+                               public mus::WindowTreeConnectionObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   NonClientFrameViewMash(views::Widget* frame, mus::Window* window);
   ~NonClientFrameViewMash() override;
 
   static gfx::Insets GetPreferredClientAreaInsets();
   static int GetMaxTitleBarButtonWidth();
 
@@ skipping 20 matching lines @@
   gfx::Size GetMaximumSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
   void PaintChildren(const ui::PaintContext& context) override;
 
   // mus::WindowObserver:
   void OnWindowClientAreaChanged(
       mus::Window* window,
       const gfx::Insets& old_client_area,
       const std::vector<gfx::Rect>& old_additional_client_area) override;
   void OnWindowDestroyed(mus::Window* window) override;
+  void OnWindowSharedPropertyChanged(
+      mus::Window* window,
+      const std::string& name,
+      const std::vector<uint8_t>* old_data,
+      const std::vector<uint8_t>* new_data) override;
 
   // Get the view of the header.
   views::View* GetHeaderView();
 
  private:
   class OverlayView;
 
   // Height from top of window to top of client area.
   int NonClientTopBorderHeight() const;
 
+  void RemoveObservers();
+
+  // mus::WindowTreeConnectionObserver:
+  void OnWindowTreeFocusChanged(mus::Window* gained_focus,
+                                mus::Window* lost_focus) override;
+
   // Not owned.
   views::Widget* frame_;
 
   mus::Window* window_;
   ui::PaintCache paint_cache_;
 
   // View which contains the title and window controls.
   class HeaderView;
   HeaderView* header_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameViewMash);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_