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

Unified Diff: components/web_view/frame_connection.cc

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/frame_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/frame_connection.cc
diff --git a/components/web_view/frame_connection.cc b/components/web_view/frame_connection.cc
index 896dad49b232ca5a2fd180afec5a65c8d451ba7a..70e8d2d2c3d28bdfd55180c9d7ef5df56daf0f6b 100644
--- a/components/web_view/frame_connection.cc
+++ b/components/web_view/frame_connection.cc
@@ -74,7 +74,8 @@ void FrameConnection::Init(mojo::ApplicationImpl* app,
const base::Closure& on_got_id_callback) {
DCHECK(!application_connection_);
- mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New());
+ mojo::shell::mojom::CapabilityFilterPtr filter(
+ mojo::shell::mojom::CapabilityFilter::New());
mojo::Array<mojo::String> resource_provider_interfaces;
resource_provider_interfaces.push_back(
resource_provider::ResourceProvider::Name_);
@@ -131,7 +132,8 @@ mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
}
uint32_t FrameConnection::GetContentHandlerID() const {
- uint32_t content_handler_id = mojo::Shell::kInvalidApplicationID;
+ uint32_t content_handler_id =
+ mojo::shell::mojom::Shell::kInvalidApplicationID;
if (!application_connection_->GetRemoteContentHandlerID(&content_handler_id))
NOTREACHED();
return content_handler_id;
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/web_view/frame_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698