mash: Fix mash app shelf items; encapsulate ash property setup.

ui/views/examples/examples_window.cc

 // Copyright (c) 2012 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/examples/examples_window.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <utility>
@@ skipping 201 matching lines @@
   View* example_shown_;
   Label* status_label_;
   const Operation operation_;
 
   DISALLOW_COPY_AND_ASSIGN(ExamplesWindowContents);
 };
 
 // static
 ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
 
-void ShowExamplesWindow(Operation operation,
-                        gfx::NativeWindow window_context,
-                        ExampleVector extra_examples) {
+Widget* ShowExamplesWindow(Operation operation,
+                           gfx::NativeWindow window_context,
+                           ExampleVector extra_examples) {
   if (ExamplesWindowContents::instance()) {
     ExamplesWindowContents::instance()->GetWidget()->Activate();
   } else {
     ExampleVector examples = GetExamplesToShow(std::move(extra_examples));
     Widget* widget = new Widget;
     Widget::InitParams params;
     params.delegate =
         new ExamplesWindowContents(operation, std::move(examples));
     params.context = window_context;
     widget->Init(params);
     widget->Show();
   }
+  return ExamplesWindowContents::instance()->GetWidget();
 }
 
 void LogStatus(const std::string& string) {
   ExamplesWindowContents::instance()->SetStatus(string);
 }
 
 }  // namespace examples
 }  // namespace views