OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/touch_hud/mus/touch_hud_application.h" | 5 #include "ash/touch_hud/mus/touch_hud_application.h" |
6 | 6 |
7 #include "ash/public/interfaces/container.mojom.h" | 7 #include "ash/public/interfaces/container.mojom.h" |
8 #include "ash/touch_hud/touch_hud_renderer.h" | 8 #include "ash/touch_hud/touch_hud_renderer.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 std::map<std::string, std::vector<uint8_t>> properties; | 84 std::map<std::string, std::vector<uint8_t>> properties; |
85 properties[ash::mojom::kWindowContainer_Property] = | 85 properties[ash::mojom::kWindowContainer_Property] = |
86 mojo::ConvertTo<std::vector<uint8_t>>( | 86 mojo::ConvertTo<std::vector<uint8_t>>( |
87 static_cast<int32_t>(ash::mojom::Container::OVERLAY)); | 87 static_cast<int32_t>(ash::mojom::Container::OVERLAY)); |
88 properties[ui::mojom::WindowManager::kShowState_Property] = | 88 properties[ui::mojom::WindowManager::kShowState_Property] = |
89 mojo::ConvertTo<std::vector<uint8_t>>( | 89 mojo::ConvertTo<std::vector<uint8_t>>( |
90 static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN)); | 90 static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN)); |
91 ui::Window* window = | 91 ui::Window* window = |
92 window_manager_connection_.get()->NewWindow(properties); | 92 window_manager_connection_.get()->NewWindow(properties); |
93 params.native_widget = new views::NativeWidgetMus( | 93 params.native_widget = new views::NativeWidgetMus( |
94 widget_, connector(), window, ui::mojom::SurfaceType::DEFAULT); | 94 widget_, window, ui::mojom::SurfaceType::DEFAULT); |
95 widget_->Init(params); | 95 widget_->Init(params); |
96 widget_->Show(); | 96 widget_->Show(); |
97 } else { | 97 } else { |
98 widget_->Close(); | 98 widget_->Close(); |
99 base::MessageLoop::current()->QuitWhenIdle(); | 99 base::MessageLoop::current()->QuitWhenIdle(); |
100 } | 100 } |
101 } | 101 } |
102 | 102 |
103 void TouchHudApplication::Create(const shell::Identity& remote_identity, | 103 void TouchHudApplication::Create(const shell::Identity& remote_identity, |
104 mash::mojom::LaunchableRequest request) { | 104 mash::mojom::LaunchableRequest request) { |
105 binding_.Bind(std::move(request)); | 105 binding_.Bind(std::move(request)); |
106 } | 106 } |
107 | 107 |
108 } // namespace touch_hud | 108 } // namespace touch_hud |
109 } // namespace ash | 109 } // namespace ash |
OLD | NEW |