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

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

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 | « examples/wget/wget.cc ('k') | examples/wm_flow/app/app.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/bind.h" 5 #include "base/bind.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "examples/window_manager/debug_panel_host.mojom.h" 7 #include "examples/window_manager/debug_panel_host.mojom.h"
8 #include "examples/window_manager/window_manager.mojom.h" 8 #include "examples/window_manager/window_manager.mojom.h"
9 #include "mojo/application/application_runner_chromium.h" 9 #include "mojo/application/application_runner_chromium.h"
10 #include "mojo/common/weak_binding_set.h" 10 #include "mojo/common/weak_binding_set.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // Overridden from ApplicationDelegate: 280 // Overridden from ApplicationDelegate:
281 void Initialize(ApplicationImpl* app) override { 281 void Initialize(ApplicationImpl* app) override {
282 shell_ = app->shell(); 282 shell_ = app->shell();
283 app_ = app; 283 app_ = app;
284 // FIXME: Mojo applications don't know their URLs yet: 284 // FIXME: Mojo applications don't know their URLs yet:
285 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne yXJnke-MnYYL4Gz1AKDos 285 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne yXJnke-MnYYL4Gz1AKDos
286 url_ = GURL(app->args()[1]); 286 url_ = GURL(app->args()[1]);
287 window_manager_app_->Initialize(app); 287 window_manager_app_->Initialize(app);
288 } 288 }
289 289
290 virtual bool ConfigureIncomingConnection( 290 bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
291 ApplicationConnection* connection) override {
292 connection->AddService<IWindowManager>(this); 291 connection->AddService<IWindowManager>(this);
293 window_manager_app_->ConfigureIncomingConnection(connection); 292 window_manager_app_->ConfigureIncomingConnection(connection);
294 return true; 293 return true;
295 } 294 }
296 295
297 // Overridden from ViewManagerDelegate: 296 // Overridden from ViewManagerDelegate:
298 void OnEmbed(View* root, 297 void OnEmbed(View* root,
299 InterfaceRequest<ServiceProvider> services, 298 InterfaceRequest<ServiceProvider> services,
300 ServiceProviderPtr exposed_services) override { 299 ServiceProviderPtr exposed_services) override {
301 DCHECK(!view_manager_); 300 DCHECK(!view_manager_);
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 ++current_index_; 531 ++current_index_;
533 } 532 }
534 533
535 } // namespace examples 534 } // namespace examples
536 } // namespace mojo 535 } // namespace mojo
537 536
538 MojoResult MojoMain(MojoHandle shell_handle) { 537 MojoResult MojoMain(MojoHandle shell_handle) {
539 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); 538 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);
540 return runner.Run(shell_handle); 539 return runner.Run(shell_handle);
541 } 540 }
OLDNEW
« no previous file with comments | « examples/wget/wget.cc ('k') | examples/wm_flow/app/app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698