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

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

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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/tools/tester/tester.cc ('k') | sky/viewer/viewer.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 "base/supports_user_data.h" 9 #include "base/supports_user_data.h"
10 #include "dart/runtime/include/dart_api.h" 10 #include "dart/runtime/include/dart_api.h"
11 #include "mojo/public/interfaces/application/shell.mojom.h" 11 #include "mojo/public/interfaces/application/shell.mojom.h"
12 #include "sky/services/testing/test_harness.mojom.h" 12 #include "sky/services/testing/test_harness.mojom.h"
13 13
14 namespace sky { 14 namespace sky {
15 class DocumentView; 15 class DocumentView;
16 16
17 class Internals : public base::SupportsUserData::Data, 17 class Internals : public base::SupportsUserData::Data,
18 public mojo::Shell { 18 public mojo::Shell {
19 public: 19 public:
20 virtual ~Internals(); 20 ~Internals() override;
21 21
22 static void Create(Dart_Isolate isolate, DocumentView* document_view); 22 static void Create(Dart_Isolate isolate, DocumentView* document_view);
23 23
24 // mojo::Shell method: 24 // mojo::Shell method:
25 void ConnectToApplication( 25 void ConnectToApplication(
26 const mojo::String& application_url, 26 const mojo::String& application_url,
27 mojo::InterfaceRequest<mojo::ServiceProvider> services, 27 mojo::InterfaceRequest<mojo::ServiceProvider> services,
28 mojo::ServiceProviderPtr exposed_services) override; 28 mojo::ServiceProviderPtr exposed_services) override;
29 29
30 std::string RenderTreeAsText(); 30 std::string RenderTreeAsText();
(...skipping 13 matching lines...) Expand all
44 base::WeakPtr<DocumentView> document_view_; 44 base::WeakPtr<DocumentView> document_view_;
45 mojo::Binding<mojo::Shell> shell_binding_; 45 mojo::Binding<mojo::Shell> shell_binding_;
46 TestHarnessPtr test_harness_; 46 TestHarnessPtr test_harness_;
47 47
48 MOJO_DISALLOW_COPY_AND_ASSIGN(Internals); 48 MOJO_DISALLOW_COPY_AND_ASSIGN(Internals);
49 }; 49 };
50 50
51 } // namespace sky 51 } // namespace sky
52 52
53 #endif // SKY_VIEWER_INTERNALS_H_ 53 #endif // SKY_VIEWER_INTERNALS_H_
OLDNEW
« no previous file with comments | « sky/tools/tester/tester.cc ('k') | sky/viewer/viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698