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

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

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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/shell/ui/internals.cc ('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/engine/config.h"
6 #include "sky/viewer/internals.h" 5 #include "sky/viewer/internals.h"
7 6
8 #include "mojo/public/cpp/application/connect.h" 7 #include "mojo/public/cpp/application/connect.h"
9 #include "mojo/public/cpp/bindings/array.h" 8 #include "mojo/public/cpp/bindings/array.h"
10 #include "sky/engine/public/web/WebDocument.h" 9 #include "sky/engine/public/web/WebDocument.h"
11 #include "sky/engine/public/web/WebFrame.h" 10 #include "sky/engine/public/web/WebFrame.h"
12 #include "sky/engine/public/web/WebView.h" 11 #include "sky/engine/public/web/WebView.h"
13 #include "sky/engine/tonic/dart_builtin.h" 12 #include "sky/engine/tonic/dart_builtin.h"
14 #include "sky/engine/tonic/dart_converter.h" 13 #include "sky/engine/tonic/dart_converter.h"
15 #include "sky/engine/tonic/dart_error.h" 14 #include "sky/engine/tonic/dart_error.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const mojo::String& application_url, 167 const mojo::String& application_url,
169 mojo::InterfaceRequest<mojo::ServiceProvider> services, 168 mojo::InterfaceRequest<mojo::ServiceProvider> services,
170 mojo::ServiceProviderPtr exposed_services) { 169 mojo::ServiceProviderPtr exposed_services) {
171 if (document_view_) { 170 if (document_view_) {
172 document_view_->shell()->ConnectToApplication( 171 document_view_->shell()->ConnectToApplication(
173 application_url, services.Pass(), exposed_services.Pass()); 172 application_url, services.Pass(), exposed_services.Pass());
174 } 173 }
175 } 174 }
176 175
177 } // namespace sky 176 } // namespace sky
OLDNEW
« no previous file with comments | « sky/shell/ui/internals.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698