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/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 } | 66 } |
67 TouchHudApplication::~TouchHudApplication() {} | 67 TouchHudApplication::~TouchHudApplication() {} |
68 | 68 |
69 void TouchHudApplication::OnStart() { | 69 void TouchHudApplication::OnStart() { |
70 aura_init_ = base::MakeUnique<views::AuraInit>( | 70 aura_init_ = base::MakeUnique<views::AuraInit>( |
71 context()->connector(), context()->identity(), "views_mus_resources.pak", | 71 context()->connector(), context()->identity(), "views_mus_resources.pak", |
72 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); | 72 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); |
73 } | 73 } |
74 | 74 |
75 void TouchHudApplication::OnBindInterface( | 75 void TouchHudApplication::OnBindInterface( |
76 const service_manager::ServiceInfo& source_info, | 76 const service_manager::BindSourceInfo& source_info, |
77 const std::string& interface_name, | 77 const std::string& interface_name, |
78 mojo::ScopedMessagePipeHandle interface_pipe) { | 78 mojo::ScopedMessagePipeHandle interface_pipe) { |
79 registry_.BindInterface(source_info.identity, interface_name, | 79 registry_.BindInterface(source_info.identity, interface_name, |
80 std::move(interface_pipe)); | 80 std::move(interface_pipe)); |
81 } | 81 } |
82 | 82 |
83 void TouchHudApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) { | 83 void TouchHudApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) { |
84 if (!widget_) { | 84 if (!widget_) { |
85 widget_ = new views::Widget; | 85 widget_ = new views::Widget; |
86 views::Widget::InitParams params( | 86 views::Widget::InitParams params( |
(...skipping 16 matching lines...) Expand all Loading... |
103 | 103 |
104 void TouchHudApplication::Create( | 104 void TouchHudApplication::Create( |
105 const service_manager::Identity& remote_identity, | 105 const service_manager::Identity& remote_identity, |
106 mash::mojom::LaunchableRequest request) { | 106 mash::mojom::LaunchableRequest request) { |
107 binding_.Close(); | 107 binding_.Close(); |
108 binding_.Bind(std::move(request)); | 108 binding_.Bind(std::move(request)); |
109 } | 109 } |
110 | 110 |
111 } // namespace touch_hud | 111 } // namespace touch_hud |
112 } // namespace ash | 112 } // namespace ash |
OLD | NEW |