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

mash/wm/non_client_frame_controller.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 "mash/wm/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
@@ skipping 107 matching lines @@
     window_tree_host->window()->SetLayoutManager(layout_manager);
     const int inset = Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
     window_tree_host->SetOutputSurfacePadding(
         gfx::Insets(inset, inset, inset, inset));
     window_tree_host->window()->layer()->Add(shadow_->layer());
     shadow_->layer()->parent()->StackAtBottom(shadow_->layer());
   }
   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.
   }
 
  private:
   // The shadow, may be null.
   scoped_ptr<Shadow> shadow_;
 
   scoped_ptr<MoveEventHandler> move_event_handler_;
@@ skipping 112 matching lines @@
     widget_->UpdateWindowTitle();
 }
 
 void NonClientFrameController::OnWindowDestroyed(mus::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace wm
 }  // namespace mash