| OLD | NEW |
| 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 "base/strings/string_tokenizer.h" | 5 #include "base/strings/string_tokenizer.h" |
| 6 #include "examples/bitmap_uploader/bitmap_uploader.h" | 6 #include "examples/bitmap_uploader/bitmap_uploader.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/application/content_handler_factory.h" | 8 #include "mojo/application/content_handler_factory.h" |
| 9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 } | 76 } |
| 77 | 77 |
| 78 virtual bool ConfigureIncomingConnection( | 78 virtual bool ConfigureIncomingConnection( |
| 79 ApplicationConnection* connection) override { | 79 ApplicationConnection* connection) override { |
| 80 connection->AddService(view_manager_client_factory_.get()); | 80 connection->AddService(view_manager_client_factory_.get()); |
| 81 return true; | 81 return true; |
| 82 } | 82 } |
| 83 | 83 |
| 84 // Overridden from ViewManagerDelegate: | 84 // Overridden from ViewManagerDelegate: |
| 85 virtual void OnEmbed(View* root, | 85 virtual void OnEmbed(View* root, |
| 86 ServiceProviderImpl* exported_services, | 86 InterfaceRequest<ServiceProvider> services, |
| 87 scoped_ptr<ServiceProvider> imported_services) override { | 87 ServiceProviderPtr exposed_services) override { |
| 88 DCHECK(embedder_for_roots_.find(root) == embedder_for_roots_.end()); | 88 DCHECK(embedder_for_roots_.find(root) == embedder_for_roots_.end()); |
| 89 root->AddObserver(this); | 89 root->AddObserver(this); |
| 90 EmbedderData* embedder_data = new EmbedderData(app_->shell(), root); | 90 EmbedderData* embedder_data = new EmbedderData(app_->shell(), root); |
| 91 embedder_for_roots_[root] = embedder_data; | 91 embedder_for_roots_[root] = embedder_data; |
| 92 DrawBitmap(embedder_data); | 92 DrawBitmap(embedder_data); |
| 93 } | 93 } |
| 94 | 94 |
| 95 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {} | 95 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {} |
| 96 | 96 |
| 97 // Overridden from ViewObserver: | 97 // Overridden from ViewObserver: |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 DISALLOW_COPY_AND_ASSIGN(PDFViewer); | 240 DISALLOW_COPY_AND_ASSIGN(PDFViewer); |
| 241 }; | 241 }; |
| 242 | 242 |
| 243 } // namespace examples | 243 } // namespace examples |
| 244 } // namespace mojo | 244 } // namespace mojo |
| 245 | 245 |
| 246 MojoResult MojoMain(MojoHandle shell_handle) { | 246 MojoResult MojoMain(MojoHandle shell_handle) { |
| 247 mojo::ApplicationRunnerChromium runner(new mojo::examples::PDFViewer()); | 247 mojo::ApplicationRunnerChromium runner(new mojo::examples::PDFViewer()); |
| 248 return runner.Run(shell_handle); | 248 return runner.Run(shell_handle); |
| 249 } | 249 } |
| OLD | NEW |