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

Side by Side Diff: sky/viewer/internals.h

Issue 845593003: Pass ServiceProvider and ServiceProvider& params in Connect (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: use nullptr instead of ServiceProviderPtr(), fix ShellImpl Created 5 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 | « sky/viewer/document_view.cc ('k') | sky/viewer/internals.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 SKY_VIEWER_INTERNALS_H_ 5 #ifndef SKY_VIEWER_INTERNALS_H_
6 #define SKY_VIEWER_INTERNALS_H_ 6 #define SKY_VIEWER_INTERNALS_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "gin/handle.h" 9 #include "gin/handle.h"
10 #include "gin/object_template_builder.h" 10 #include "gin/object_template_builder.h"
(...skipping 13 matching lines...) Expand all
24 virtual ~Internals(); 24 virtual ~Internals();
25 25
26 virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( 26 virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
27 v8::Isolate* isolate) override; 27 v8::Isolate* isolate) override;
28 28
29 private: 29 private:
30 explicit Internals(DocumentView* document_view); 30 explicit Internals(DocumentView* document_view);
31 31
32 // mojo::Shell method: 32 // mojo::Shell method:
33 void ConnectToApplication( 33 void ConnectToApplication(
34 const mojo::String& application_url, 34 const mojo::String& application_url,
35 mojo::InterfaceRequest<mojo::ServiceProvider> provider) override; 35 mojo::InterfaceRequest<mojo::ServiceProvider> services,
36 mojo::ServiceProviderPtr exposed_services) override;
36 37
37 mojo::Handle PassShellProxyHandle(); 38 mojo::Handle PassShellProxyHandle();
38 std::string RenderTreeAsText(); 39 std::string RenderTreeAsText();
39 std::string ContentAsText(); 40 std::string ContentAsText();
40 void NotifyTestComplete(const std::string& test_result); 41 void NotifyTestComplete(const std::string& test_result);
41 42
42 mojo::Handle ConnectToEmbedderService(const std::string& interface_name); 43 mojo::Handle ConnectToEmbedderService(const std::string& interface_name);
43 44
44 mojo::Handle ConnectToService( 45 mojo::Handle ConnectToService(
45 const std::string& application_url, const std::string& interface_name); 46 const std::string& application_url, const std::string& interface_name);
46 47
47 void pauseAnimations(double pauseTime); 48 void pauseAnimations(double pauseTime);
48 49
49 base::WeakPtr<DocumentView> document_view_; 50 base::WeakPtr<DocumentView> document_view_;
50 mojo::Binding<mojo::Shell> shell_binding_; 51 mojo::Binding<mojo::Shell> shell_binding_;
51 TestHarnessPtr test_harness_; 52 TestHarnessPtr test_harness_;
52 53
53 MOJO_DISALLOW_COPY_AND_ASSIGN(Internals); 54 MOJO_DISALLOW_COPY_AND_ASSIGN(Internals);
54 }; 55 };
55 56
56 } // namespace sky 57 } // namespace sky
57 58
58 #endif // SKY_VIEWER_INTERNALS_H_ 59 #endif // SKY_VIEWER_INTERNALS_H_
OLDNEW
« no previous file with comments | « sky/viewer/document_view.cc ('k') | sky/viewer/internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698