Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: mash/shelf/shelf_application.cc

Issue 1585363002: Fork a subset of ash/shelf for use in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert ash changes. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mash/shelf/shelf_application.h" 5 #include "mash/shelf/shelf_application.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "components/mus/public/cpp/property_type_converters.h" 9 #include "components/mus/public/cpp/property_type_converters.h"
10 #include "mash/shelf/shelf_view.h" 10 #include "mash/shelf/shelf_view.h"
11 #include "mash/wm/public/interfaces/container.mojom.h" 11 #include "mash/wm/public/interfaces/container.mojom.h"
12 #include "mojo/shell/public/cpp/application_impl.h" 12 #include "mojo/shell/public/cpp/application_impl.h"
13 #include "ui/views/mus/aura_init.h" 13 #include "ui/views/mus/aura_init.h"
14 #include "ui/views/mus/native_widget_mus.h" 14 #include "ui/views/mus/native_widget_mus.h"
15 #include "ui/views/mus/window_manager_connection.h" 15 #include "ui/views/mus/window_manager_connection.h"
16 16
17 namespace mash { 17 namespace mash {
18 namespace shelf { 18 namespace shelf {
19 19
20 ShelfApplication::ShelfApplication() {} 20 ShelfApplication::ShelfApplication() {}
21 21
22 ShelfApplication::~ShelfApplication() {} 22 ShelfApplication::~ShelfApplication() {}
23 23
24 void ShelfApplication::Initialize(mojo::ApplicationImpl* app) { 24 void ShelfApplication::Initialize(mojo::ApplicationImpl* app) {
25 tracing_.Initialize(app); 25 tracing_.Initialize(app);
26 26
27 aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak")); 27 aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak"));
28 views::WindowManagerConnection::Create(app); 28 views::WindowManagerConnection::Create(app);
29 29
30 // Construct the shelf using a container tagged for positioning by the WM.
30 views::Widget* widget = new views::Widget; 31 views::Widget* widget = new views::Widget;
31 views::Widget::InitParams params( 32 views::Widget::InitParams params(
32 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 33 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
33 params.delegate = new ShelfView(app);
34
35 std::map<std::string, std::vector<uint8_t>> properties; 34 std::map<std::string, std::vector<uint8_t>> properties;
36 properties[mash::wm::mojom::kWindowContainer_Property] = 35 properties[mash::wm::mojom::kWindowContainer_Property] =
37 mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert( 36 mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
38 static_cast<int32_t>(mash::wm::mojom::Container::USER_SHELF)); 37 static_cast<int32_t>(mash::wm::mojom::Container::USER_SHELF));
39 mus::Window* window = 38 mus::Window* window =
40 views::WindowManagerConnection::Get()->NewWindow(properties); 39 views::WindowManagerConnection::Get()->NewWindow(properties);
41 params.native_widget = new views::NativeWidgetMus( 40 params.native_widget = new views::NativeWidgetMus(
42 widget, app->shell(), window, mus::mojom::SurfaceType::DEFAULT); 41 widget, app->shell(), window, mus::mojom::SurfaceType::DEFAULT);
43 widget->Init(params); 42 widget->Init(params);
43 widget->SetContentsView(new ShelfView(app));
msw 2016/01/27 07:43:41 Add a note and file a bug.
44 widget->CenterWindow(widget->GetContentsView()->GetPreferredSize());
44 widget->Show(); 45 widget->Show();
45 } 46 }
46 47
47 bool ShelfApplication::ConfigureIncomingConnection( 48 bool ShelfApplication::ConfigureIncomingConnection(
48 mojo::ApplicationConnection* connection) { 49 mojo::ApplicationConnection* connection) {
49 return true; 50 return true;
50 } 51 }
51 52
52 } // namespace shelf 53 } // namespace shelf
53 } // namespace mash 54 } // namespace mash
OLDNEW
« no previous file with comments | « mash/shelf/DEPS ('k') | mash/shelf/shelf_button.h » ('j') | mash/shelf/shelf_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698