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

Side by Side Diff: mandoline/tab/frame_connection.cc

Issue 1278673002: Add stats collection for telemetry startup.warm.blank_page test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comment. Created 5 years, 4 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
« no previous file with comments | « mandoline/tab/DEPS ('k') | mandoline/ui/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "mandoline/tab/frame_connection.h" 5 #include "mandoline/tab/frame_connection.h"
6 6
7 #include "components/clipboard/public/interfaces/clipboard.mojom.h" 7 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
8 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h " 8 #include "components/devtools_service/public/interfaces/devtools_service.mojom.h "
9 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 9 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
10 #include "components/view_manager/public/interfaces/display.mojom.h" 10 #include "components/view_manager/public/interfaces/display.mojom.h"
11 #include "components/view_manager/public/interfaces/gpu.mojom.h" 11 #include "components/view_manager/public/interfaces/gpu.mojom.h"
12 #include "components/view_manager/public/interfaces/surfaces.mojom.h" 12 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
13 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h" 13 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
14 #include "mojo/application/public/cpp/application_connection.h" 14 #include "mojo/application/public/cpp/application_connection.h"
15 #include "mojo/application/public/cpp/application_impl.h" 15 #include "mojo/application/public/cpp/application_impl.h"
16 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" 16 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
17 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" 17 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
18 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" 18 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
19 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
19 20
20 #if defined(OS_LINUX) && !defined(OS_ANDROID) 21 #if defined(OS_LINUX) && !defined(OS_ANDROID)
21 #include "components/font_service/public/interfaces/font_service.mojom.h" 22 #include "components/font_service/public/interfaces/font_service.mojom.h"
22 #endif 23 #endif
23 24
24 namespace mandoline { 25 namespace mandoline {
25 26
26 FrameConnection::FrameConnection() : application_connection_(nullptr) { 27 FrameConnection::FrameConnection() : application_connection_(nullptr) {
27 } 28 }
28 29
(...skipping 21 matching lines...) Expand all
50 51
51 mojo::Array<mojo::String> clipboard_interfaces; 52 mojo::Array<mojo::String> clipboard_interfaces;
52 clipboard_interfaces.push_back(mojo::Clipboard::Name_); 53 clipboard_interfaces.push_back(mojo::Clipboard::Name_);
53 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); 54 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass());
54 55
55 mojo::Array<mojo::String> surfaces_interfaces; 56 mojo::Array<mojo::String> surfaces_interfaces;
56 surfaces_interfaces.push_back(mojo::DisplayFactory::Name_); 57 surfaces_interfaces.push_back(mojo::DisplayFactory::Name_);
57 surfaces_interfaces.push_back(mojo::Surface::Name_); 58 surfaces_interfaces.push_back(mojo::Surface::Name_);
58 filter->filter.insert("mojo:surfaces_service", surfaces_interfaces.Pass()); 59 filter->filter.insert("mojo:surfaces_service", surfaces_interfaces.Pass());
59 60
61 mojo::Array<mojo::String> tracing_interfaces;
62 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_);
63 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
64
60 mojo::Array<mojo::String> view_manager_interfaces; 65 mojo::Array<mojo::String> view_manager_interfaces;
61 view_manager_interfaces.push_back(mojo::Gpu::Name_); 66 view_manager_interfaces.push_back(mojo::Gpu::Name_);
62 view_manager_interfaces.push_back(mojo::ViewManagerRoot::Name_); 67 view_manager_interfaces.push_back(mojo::ViewManagerRoot::Name_);
63 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); 68 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass());
64 69
65 mojo::Array<mojo::String> devtools_interfaces; 70 mojo::Array<mojo::String> devtools_interfaces;
66 devtools_interfaces.push_back(devtools_service::DevToolsRegistry::Name_); 71 devtools_interfaces.push_back(devtools_service::DevToolsRegistry::Name_);
67 filter->filter.insert("mojo:devtools_service", devtools_interfaces.Pass()); 72 filter->filter.insert("mojo:devtools_service", devtools_interfaces.Pass());
68 73
69 #if defined(OS_LINUX) && !defined(OS_ANDROID) 74 #if defined(OS_LINUX) && !defined(OS_ANDROID)
70 mojo::Array<mojo::String> font_service_interfaces; 75 mojo::Array<mojo::String> font_service_interfaces;
71 font_service_interfaces.push_back(font_service::FontService::Name_); 76 font_service_interfaces.push_back(font_service::FontService::Name_);
72 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); 77 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
73 #endif 78 #endif
74 79
75 application_connection_ = app->ConnectToApplicationWithCapabilityFilter( 80 application_connection_ = app->ConnectToApplicationWithCapabilityFilter(
76 request.Pass(), filter.Pass()); 81 request.Pass(), filter.Pass());
77 application_connection_->ConnectToService(view_manage_client); 82 application_connection_->ConnectToService(view_manage_client);
78 application_connection_->ConnectToService(&frame_tree_client_); 83 application_connection_->ConnectToService(&frame_tree_client_);
79 frame_tree_client_.set_connection_error_handler([]() { 84 frame_tree_client_.set_connection_error_handler([]() {
80 // TODO(sky): implement this. 85 // TODO(sky): implement this.
81 NOTIMPLEMENTED(); 86 NOTIMPLEMENTED();
82 }); 87 });
83 } 88 }
84 89
85 } // namespace mandoline 90 } // namespace mandoline
OLDNEW
« no previous file with comments | « mandoline/tab/DEPS ('k') | mandoline/ui/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698