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

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

Issue 690743003: Move mojo/bindings/js to mojo/edk/js (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 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
« mojo/edk/js/BUILD.gn ('K') | « sky/viewer/DEPS ('k') | no next file » | 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 #include "sky/viewer/internals.h" 5 #include "sky/viewer/internals.h"
6 6
7 #include "mojo/bindings/js/core.h" 7 #include "mojo/edk/js/core.h"
8 #include "mojo/bindings/js/support.h" 8 #include "mojo/edk/js/handle.h"
9 #include "mojo/bindings/js/handle.h" 9 #include "mojo/edk/js/support.h"
10 #include "mojo/public/cpp/application/connect.h" 10 #include "mojo/public/cpp/application/connect.h"
11 #include "mojo/public/interfaces/application/shell.mojom.h" 11 #include "mojo/public/interfaces/application/shell.mojom.h"
12 #include "sky/engine/public/web/WebFrame.h" 12 #include "sky/engine/public/web/WebFrame.h"
13 #include "sky/engine/public/web/WebView.h" 13 #include "sky/engine/public/web/WebView.h"
14 #include "sky/viewer/document_view.h" 14 #include "sky/viewer/document_view.h"
15 #include "v8/include/v8.h" 15 #include "v8/include/v8.h"
16 #include <limits> 16 #include <limits>
17 17
18 namespace sky { 18 namespace sky {
19 19
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 mojo::ServiceProviderPtr service_provider; 81 mojo::ServiceProviderPtr service_provider;
82 document_view_->shell()->ConnectToApplication( 82 document_view_->shell()->ConnectToApplication(
83 application_url, mojo::GetProxy(&service_provider)); 83 application_url, mojo::GetProxy(&service_provider));
84 84
85 mojo::MessagePipe pipe; 85 mojo::MessagePipe pipe;
86 service_provider->ConnectToService(interface_name, pipe.handle1.Pass()); 86 service_provider->ConnectToService(interface_name, pipe.handle1.Pass());
87 return pipe.handle0.release(); 87 return pipe.handle0.release();
88 } 88 }
89 89
90 } // namespace sky 90 } // namespace sky
OLDNEW
« mojo/edk/js/BUILD.gn ('K') | « sky/viewer/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698