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

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

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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_connection.h ('k') | components/web_view/frame_tree.h » ('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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "components/clipboard/public/interfaces/clipboard.mojom.h" 9 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
10 #include "components/mus/public/interfaces/gpu.mojom.h"
11 #include "components/mus/public/interfaces/view_tree_host.mojom.h"
10 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h" 12 #include "components/resource_provider/public/interfaces/resource_provider.mojom .h"
11 #include "components/view_manager/public/interfaces/gpu.mojom.h"
12 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
13 #include "components/web_view/frame_tree.h" 13 #include "components/web_view/frame_tree.h"
14 #include "components/web_view/frame_utils.h" 14 #include "components/web_view/frame_utils.h"
15 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m ojom.h" 15 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m ojom.h"
16 #include "mojo/application/public/cpp/application_connection.h" 16 #include "mojo/application/public/cpp/application_connection.h"
17 #include "mojo/application/public/cpp/application_impl.h" 17 #include "mojo/application/public/cpp/application_impl.h"
18 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" 18 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
19 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" 19 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
20 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" 20 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
21 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" 21 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
22 22
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 } 121 }
122 122
123 uint32_t FrameConnection::GetContentHandlerID() const { 123 uint32_t FrameConnection::GetContentHandlerID() const {
124 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; 124 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
125 if (!application_connection_->GetContentHandlerID(&content_handler_id)) 125 if (!application_connection_->GetContentHandlerID(&content_handler_id))
126 NOTREACHED(); 126 NOTREACHED();
127 return content_handler_id; 127 return content_handler_id;
128 } 128 }
129 129
130 } // namespace web_view 130 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/frame_connection.h ('k') | components/web_view/frame_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698