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 "mash/browser/browser.h" | 5 #include "mash/browser/browser.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
15 #include "base/timer/timer.h" | 15 #include "base/timer/timer.h" |
16 #include "content/public/common/service_names.mojom.h" | 16 #include "content/public/common/service_names.mojom.h" |
17 #include "mash/browser/debug_view.h" | 17 #include "mash/browser/debug_view.h" |
18 #include "mash/public/interfaces/launchable.mojom.h" | 18 #include "mash/public/interfaces/launchable.mojom.h" |
19 #include "services/navigation/public/cpp/view.h" | 19 #include "services/navigation/public/cpp/view.h" |
20 #include "services/navigation/public/cpp/view_delegate.h" | 20 #include "services/navigation/public/cpp/view_delegate.h" |
21 #include "services/navigation/public/cpp/view_observer.h" | 21 #include "services/navigation/public/cpp/view_observer.h" |
22 #include "services/navigation/public/interfaces/view.mojom.h" | 22 #include "services/navigation/public/interfaces/view.mojom.h" |
23 #include "services/service_manager/public/c/main.h" | 23 #include "services/service_manager/public/c/main.h" |
24 #include "services/service_manager/public/cpp/connector.h" | 24 #include "services/service_manager/public/cpp/connector.h" |
25 #include "services/service_manager/public/cpp/service.h" | 25 #include "services/service_manager/public/cpp/service.h" |
26 #include "services/service_manager/public/cpp/service_context.h" | 26 #include "services/service_manager/public/cpp/service_context.h" |
27 #include "services/service_manager/public/cpp/service_runner.h" | 27 #include "services/service_manager/public/cpp/service_runner.h" |
28 #include "services/tracing/public/cpp/provider.h" | |
29 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
30 #include "ui/base/models/menu_model.h" | 29 #include "ui/base/models/menu_model.h" |
31 #include "ui/gfx/canvas.h" | 30 #include "ui/gfx/canvas.h" |
32 #include "ui/gfx/paint_throbber.h" | 31 #include "ui/gfx/paint_throbber.h" |
33 #include "ui/gfx/text_constants.h" | 32 #include "ui/gfx/text_constants.h" |
34 #include "ui/native_theme/native_theme.h" | 33 #include "ui/native_theme/native_theme.h" |
35 #include "ui/views/background.h" | 34 #include "ui/views/background.h" |
36 #include "ui/views/controls/button/label_button.h" | 35 #include "ui/views/controls/button/label_button.h" |
37 #include "ui/views/controls/menu/menu_model_adapter.h" | 36 #include "ui/views/controls/menu/menu_model_adapter.h" |
38 #include "ui/views/controls/menu/menu_runner.h" | 37 #include "ui/views/controls/menu/menu_runner.h" |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 } | 872 } |
874 | 873 |
875 std::unique_ptr<navigation::View> Browser::CreateView() { | 874 std::unique_ptr<navigation::View> Browser::CreateView() { |
876 navigation::mojom::ViewFactoryPtr factory; | 875 navigation::mojom::ViewFactoryPtr factory; |
877 context()->connector()->BindInterface(content::mojom::kBrowserServiceName, | 876 context()->connector()->BindInterface(content::mojom::kBrowserServiceName, |
878 &factory); | 877 &factory); |
879 return base::MakeUnique<navigation::View>(std::move(factory)); | 878 return base::MakeUnique<navigation::View>(std::move(factory)); |
880 } | 879 } |
881 | 880 |
882 void Browser::OnStart() { | 881 void Browser::OnStart() { |
883 tracing_.Initialize(context()->connector(), context()->identity().name()); | |
884 | |
885 aura_init_ = base::MakeUnique<views::AuraInit>( | 882 aura_init_ = base::MakeUnique<views::AuraInit>( |
886 context()->connector(), context()->identity(), "views_mus_resources.pak", | 883 context()->connector(), context()->identity(), "views_mus_resources.pak", |
887 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); | 884 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); |
888 } | 885 } |
889 | 886 |
890 void Browser::OnBindInterface(const service_manager::ServiceInfo& source_info, | 887 void Browser::OnBindInterface(const service_manager::ServiceInfo& source_info, |
891 const std::string& interface_name, | 888 const std::string& interface_name, |
892 mojo::ScopedMessagePipeHandle interface_pipe) { | 889 mojo::ScopedMessagePipeHandle interface_pipe) { |
893 registry_.BindInterface(source_info.identity, interface_name, | 890 registry_.BindInterface(source_info.identity, interface_name, |
894 std::move(interface_pipe)); | 891 std::move(interface_pipe)); |
(...skipping 15 matching lines...) Expand all Loading... |
910 AddWindow(window); | 907 AddWindow(window); |
911 } | 908 } |
912 | 909 |
913 void Browser::Create(const service_manager::Identity& remote_identity, | 910 void Browser::Create(const service_manager::Identity& remote_identity, |
914 mojom::LaunchableRequest request) { | 911 mojom::LaunchableRequest request) { |
915 bindings_.AddBinding(this, std::move(request)); | 912 bindings_.AddBinding(this, std::move(request)); |
916 } | 913 } |
917 | 914 |
918 } // namespace browser | 915 } // namespace browser |
919 } // namespace mash | 916 } // namespace mash |
OLD | NEW |