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

Side by Side Diff: examples/pdf_viewer/pdf_viewer.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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 | « examples/nesting_app/nesting_app.cc ('k') | examples/png_viewer/png_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 #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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 new ViewManagerClientFactory(app->shell(), this)); 75 new ViewManagerClientFactory(app->shell(), this));
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(ViewManager* view_manager, 85 virtual void OnEmbed(View* root,
86 View* root,
87 ServiceProviderImpl* exported_services, 86 ServiceProviderImpl* exported_services,
88 scoped_ptr<ServiceProvider> imported_services) override { 87 scoped_ptr<ServiceProvider> imported_services) override {
89 DCHECK(embedder_for_roots_.find(root) == embedder_for_roots_.end()); 88 DCHECK(embedder_for_roots_.find(root) == embedder_for_roots_.end());
90 root->AddObserver(this); 89 root->AddObserver(this);
91 EmbedderData* embedder_data = new EmbedderData(app_->shell(), root); 90 EmbedderData* embedder_data = new EmbedderData(app_->shell(), root);
92 embedder_for_roots_[root] = embedder_data; 91 embedder_for_roots_[root] = embedder_data;
93 DrawBitmap(embedder_data); 92 DrawBitmap(embedder_data);
94 } 93 }
95 94
96 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {} 95 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {}
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 DISALLOW_COPY_AND_ASSIGN(PDFViewer); 240 DISALLOW_COPY_AND_ASSIGN(PDFViewer);
242 }; 241 };
243 242
244 } // namespace examples 243 } // namespace examples
245 } // namespace mojo 244 } // namespace mojo
246 245
247 MojoResult MojoMain(MojoHandle shell_handle) { 246 MojoResult MojoMain(MojoHandle shell_handle) {
248 mojo::ApplicationRunnerChromium runner(new mojo::examples::PDFViewer()); 247 mojo::ApplicationRunnerChromium runner(new mojo::examples::PDFViewer());
249 return runner.Run(shell_handle); 248 return runner.Run(shell_handle);
250 } 249 }
OLDNEW
« no previous file with comments | « examples/nesting_app/nesting_app.cc ('k') | examples/png_viewer/png_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698