Mash: Show app icons in shelf based on the Widget's app icon

mash/wm/non_client_frame_controller.cc

Index: mash/wm/non_client_frame_controller.cc
diff --git a/mash/wm/non_client_frame_controller.cc b/mash/wm/non_client_frame_controller.cc
index ed6ad3a4b285a4dad77768ee6ff98992a23d8205..774329a3b917c96cd4d64947a681413e343e9db5 100644
--- a/mash/wm/non_client_frame_controller.cc
+++ b/mash/wm/non_client_frame_controller.cc
@@ -125,6 +125,14 @@ class WmNativeWidgetMus : public views::NativeWidgetMus {
   void CenterWindow(const gfx::Size& size) override {
     // Do nothing. The client controls the size, not us.
   }
+  bool SetWindowTitle(const base::string16& title) override {
+    // Do nothing. The client controls the window title, not us.
+    return false;
+  }
+  void SetWindowIcons(const gfx::ImageSkia& window_icon,
+                      const gfx::ImageSkia& app_icon) override {
+    // Do nothing. The client controls window icons, not us.
+  }
   void UpdateClientArea() override {
     // This pushes the client area to the WS. We don't want to do that as
     // the client area should come from the client, not us.