Chromium Code Reviews| Index: mash/shelf/shelf_application.cc |
| diff --git a/mash/shelf/shelf_application.cc b/mash/shelf/shelf_application.cc |
| index cb829fe362e7c7457e08698b6db8ae52f4dd772d..bc34ebcf14a6889fcc285b0d08dc63ac2faf7a84 100644 |
| --- a/mash/shelf/shelf_application.cc |
| +++ b/mash/shelf/shelf_application.cc |
| @@ -27,11 +27,10 @@ void ShelfApplication::Initialize(mojo::ApplicationImpl* app) { |
| aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak")); |
| views::WindowManagerConnection::Create(app); |
| + // Construct the shelf using a container tagged for positioning by the WM. |
| views::Widget* widget = new views::Widget; |
| views::Widget::InitParams params( |
| views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
| - params.delegate = new ShelfView(app); |
| - |
| std::map<std::string, std::vector<uint8_t>> properties; |
| properties[mash::wm::mojom::kWindowContainer_Property] = |
| mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( |
| @@ -41,6 +40,8 @@ void ShelfApplication::Initialize(mojo::ApplicationImpl* app) { |
| params.native_widget = new views::NativeWidgetMus( |
| widget, app->shell(), window, mus::mojom::SurfaceType::DEFAULT); |
| widget->Init(params); |
| + widget->SetContentsView(new ShelfView(app)); |
|
msw
2016/01/27 07:43:41
Add a note and file a bug.
|
| + widget->CenterWindow(widget->GetContentsView()->GetPreferredSize()); |
| widget->Show(); |
| } |