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

Side by Side Diff: content/browser/frame_host/frame_mojo_shell.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
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 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "mojo/application/public/interfaces/shell.mojom.h" 10 #include "mojo/application/public/interfaces/shell.mojom.h"
11 #include "mojo/common/weak_binding_set.h" 11 #include "mojo/common/weak_binding_set.h"
12 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" 12 #include "mojo/public/cpp/bindings/interface_request.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 class RenderFrameHost; 16 class RenderFrameHost;
17 class ServiceRegistryImpl; 17 class ServiceRegistryImpl;
18 18
19 // This provides the |mojo::Shell| service interface to each frame's 19 // This provides the |mojo::Shell| service interface to each frame's
20 // ServiceRegistry, giving frames the ability to connect to Mojo applications. 20 // ServiceRegistry, giving frames the ability to connect to Mojo applications.
21 class FrameMojoShell : public mojo::Shell { 21 class FrameMojoShell : public mojo::Shell {
22 public: 22 public:
(...skipping 20 matching lines...) Expand all
43 // ServiceRegistry providing browser services to connected applications. 43 // ServiceRegistry providing browser services to connected applications.
44 scoped_ptr<ServiceRegistryImpl> service_registry_; 44 scoped_ptr<ServiceRegistryImpl> service_registry_;
45 mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_; 45 mojo::WeakBindingSet<mojo::ServiceProvider> service_provider_bindings_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell); 47 DISALLOW_COPY_AND_ASSIGN(FrameMojoShell);
48 }; 48 };
49 49
50 } // namespace content 50 } // namespace content
51 51
52 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_ 52 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_MOJO_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698