| OLD | NEW |
| 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/wm/window_manager_application.h" | 5 #include "mash/wm/window_manager_application.h" |
| 6 | 6 |
| 7 #include "components/mus/common/util.h" | 7 #include "components/mus/common/util.h" |
| 8 #include "components/mus/public/cpp/window.h" | 8 #include "components/mus/public/cpp/window.h" |
| 9 #include "components/mus/public/cpp/window_tree_connection.h" | 9 #include "components/mus/public/cpp/window_tree_connection.h" |
| 10 #include "components/mus/public/cpp/window_tree_host_factory.h" | 10 #include "components/mus/public/cpp/window_tree_host_factory.h" |
| 11 #include "mash/wm/background_layout.h" | 11 #include "mash/wm/background_layout.h" |
| 12 #include "mash/wm/shelf_layout.h" | 12 #include "mash/wm/shelf_layout.h" |
| 13 #include "mash/wm/window_layout.h" | 13 #include "mash/wm/window_layout.h" |
| 14 #include "mash/wm/window_manager_impl.h" | 14 #include "mash/wm/window_manager_impl.h" |
| 15 #include "mojo/application/public/cpp/application_connection.h" | 15 #include "mojo/application/public/cpp/application_connection.h" |
| 16 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
| 16 #include "ui/mojo/init/ui_init.h" | 17 #include "ui/mojo/init/ui_init.h" |
| 17 #include "ui/views/mus/aura_init.h" | 18 #include "ui/views/mus/aura_init.h" |
| 18 #include "ui/views/mus/display_converter.h" | 19 #include "ui/views/mus/display_converter.h" |
| 19 | 20 |
| 20 WindowManagerApplication::WindowManagerApplication() | 21 WindowManagerApplication::WindowManagerApplication() |
| 21 : root_(nullptr), window_count_(0), app_(nullptr) {} | 22 : root_(nullptr), window_count_(0), app_(nullptr) {} |
| 22 WindowManagerApplication::~WindowManagerApplication() {} | 23 WindowManagerApplication::~WindowManagerApplication() {} |
| 23 | 24 |
| 24 mus::Window* WindowManagerApplication::GetWindowForContainer( | 25 mus::Window* WindowManagerApplication::GetWindowForContainer( |
| 25 mash::wm::mojom::Container container) { | 26 mash::wm::mojom::Container container) { |
| 26 const mus::Id window_id = root_->connection()->GetConnectionId() << 16 | | 27 const mus::Id window_id = root_->connection()->GetConnectionId() << 16 | |
| 27 static_cast<uint16_t>(container); | 28 static_cast<uint16_t>(container); |
| 28 return root_->GetChildById(window_id); | 29 return root_->GetChildById(window_id); |
| 29 } | 30 } |
| 30 | 31 |
| 31 mus::Window* WindowManagerApplication::GetWindowById(mus::Id id) { | 32 mus::Window* WindowManagerApplication::GetWindowById(mus::Id id) { |
| 32 return root_->GetChildById(id); | 33 return root_->GetChildById(id); |
| 33 } | 34 } |
| 34 | 35 |
| 35 void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) { | 36 void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) { |
| 36 app_ = app; | 37 app_ = app; |
| 38 tracing_.Initialize(app); |
| 37 mus::mojom::WindowManagerPtr window_manager; | 39 mus::mojom::WindowManagerPtr window_manager; |
| 38 requests_.push_back(new mojo::InterfaceRequest<mus::mojom::WindowManager>( | 40 requests_.push_back(new mojo::InterfaceRequest<mus::mojom::WindowManager>( |
| 39 mojo::GetProxy(&window_manager))); | 41 mojo::GetProxy(&window_manager))); |
| 40 mus::CreateSingleWindowTreeHost(app, this, &host_, window_manager.Pass(), | 42 mus::CreateSingleWindowTreeHost(app, this, &host_, window_manager.Pass(), |
| 41 this); | 43 this); |
| 42 } | 44 } |
| 43 | 45 |
| 44 bool WindowManagerApplication::ConfigureIncomingConnection( | 46 bool WindowManagerApplication::ConfigureIncomingConnection( |
| 45 mojo::ApplicationConnection* connection) { | 47 mojo::ApplicationConnection* connection) { |
| 46 connection->AddService(this); | 48 connection->AddService(this); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 container < static_cast<uint16_t>(mash::wm::mojom::CONTAINER_COUNT); | 117 container < static_cast<uint16_t>(mash::wm::mojom::CONTAINER_COUNT); |
| 116 ++container) { | 118 ++container) { |
| 117 mus::Window* window = root_->connection()->NewWindow(); | 119 mus::Window* window = root_->connection()->NewWindow(); |
| 118 DCHECK_EQ(mus::LoWord(window->id()), container) | 120 DCHECK_EQ(mus::LoWord(window->id()), container) |
| 119 << "Containers must be created before other windows!"; | 121 << "Containers must be created before other windows!"; |
| 120 window->SetBounds(root_->bounds()); | 122 window->SetBounds(root_->bounds()); |
| 121 window->SetVisible(true); | 123 window->SetVisible(true); |
| 122 root_->AddChild(window); | 124 root_->AddChild(window); |
| 123 } | 125 } |
| 124 } | 126 } |
| OLD | NEW |