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

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

Issue 943053003: Simple multi-url support for mojo apps (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: hate 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
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/macros.h" 5 #include "base/macros.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "examples/browser/browser_host.mojom.h" 8 #include "examples/browser/browser_host.mojom.h"
9 #include "examples/window_manager/window_manager.mojom.h" 9 #include "examples/window_manager/window_manager.mojom.h"
10 #include "mojo/application/application_runner_chromium.h" 10 #include "mojo/application/application_runner_chromium.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 shell_ = app->shell(); 50 shell_ = app->shell();
51 view_manager_client_factory_.reset( 51 view_manager_client_factory_.reset(
52 new ViewManagerClientFactory(shell_, this)); 52 new ViewManagerClientFactory(shell_, this));
53 app->ConnectToService("mojo:window_manager", &window_manager_); 53 app->ConnectToService("mojo:window_manager", &window_manager_);
54 54
55 // FIXME: Mojo applications don't know their URLs yet: 55 // FIXME: Mojo applications don't know their URLs yet:
56 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne yXJnke-MnYYL4Gz1AKDos 56 // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmne yXJnke-MnYYL4Gz1AKDos
57 url_ = GURL(app->args()[1]); 57 url_ = GURL(app->args()[1]);
58 } 58 }
59 59
60 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { 60 bool ConfigureIncomingConnection(ApplicationConnection* connection, const std: :string& url) override {
61 connection->AddService(view_manager_client_factory_.get()); 61 connection->AddService(view_manager_client_factory_.get());
62 return true; 62 return true;
63 } 63 }
64 64
65 // ViewManagerDelegate: 65 // ViewManagerDelegate:
66 void OnEmbed(View* root, 66 void OnEmbed(View* root,
67 InterfaceRequest<ServiceProvider> services, 67 InterfaceRequest<ServiceProvider> services,
68 ServiceProviderPtr exposed_services) override { 68 ServiceProviderPtr exposed_services) override {
69 // TODO: deal with OnEmbed() being invoked multiple times. 69 // TODO: deal with OnEmbed() being invoked multiple times.
70 ConnectToService(exposed_services.get(), &navigator_host_); 70 ConnectToService(exposed_services.get(), &navigator_host_);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 DISALLOW_COPY_AND_ASSIGN(Browser); 130 DISALLOW_COPY_AND_ASSIGN(Browser);
131 }; 131 };
132 132
133 } // namespace examples 133 } // namespace examples
134 } // namespace mojo 134 } // namespace mojo
135 135
136 MojoResult MojoMain(MojoHandle shell_handle) { 136 MojoResult MojoMain(MojoHandle shell_handle) {
137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser); 137 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
138 return runner.Run(shell_handle); 138 return runner.Run(shell_handle);
139 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698