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

Side by Side Diff: components/web_view/frame_connection.cc

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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 | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_devtools_agent.cc » ('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 "components/web_view/frame_connection.h" 5 #include "components/web_view/frame_connection.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "components/clipboard/public/interfaces/clipboard.mojom.h" 12 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
13 #include "components/mus/public/interfaces/gpu.mojom.h" 13 #include "components/mus/public/interfaces/gpu.mojom.h"
14 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 14 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
15 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 15 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
16 #include "components/web_view/frame_tree.h" 16 #include "components/web_view/frame_tree.h"
17 #include "components/web_view/frame_utils.h" 17 #include "components/web_view/frame_utils.h"
18 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m ojom.h" 18 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m ojom.h"
19 #include "mojo/application/public/cpp/application_connection.h"
20 #include "mojo/application/public/cpp/application_impl.h"
21 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" 19 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
22 #include "mojo/services/network/public/interfaces/network_service.mojom.h" 20 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
23 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" 21 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
24 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" 22 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
25 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" 23 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
24 #include "mojo/shell/public/cpp/application_connection.h"
25 #include "mojo/shell/public/cpp/application_impl.h"
26 26
27 #if defined(OS_LINUX) && !defined(OS_ANDROID) 27 #if defined(OS_LINUX) && !defined(OS_ANDROID)
28 #include "components/font_service/public/interfaces/font_service.mojom.h" 28 #include "components/font_service/public/interfaces/font_service.mojom.h"
29 #endif 29 #endif
30 30
31 namespace web_view { 31 namespace web_view {
32 namespace { 32 namespace {
33 33
34 // Callback from when the content handler id is obtained. 34 // Callback from when the content handler id is obtained.
35 void OnGotContentHandlerForFrame( 35 void OnGotContentHandlerForFrame(
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 uint32_t FrameConnection::GetContentHandlerID() const { 131 uint32_t FrameConnection::GetContentHandlerID() const {
132 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; 132 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
133 if (!application_connection_->GetContentHandlerID(&content_handler_id)) 133 if (!application_connection_->GetContentHandlerID(&content_handler_id))
134 NOTREACHED(); 134 NOTREACHED();
135 return content_handler_id; 135 return content_handler_id;
136 } 136 }
137 137
138 } // namespace web_view 138 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_devtools_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698