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

Unified Diff: mojo/examples/window_manager/window_manager.cc

Issue 345773003: Mojo: teach launcher about mojo:// URLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, add comments Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/mojo_services.gypi » ('j') | mojo/services/public/interfaces/launcher/launcher.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/window_manager/window_manager.cc
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
index a8fef819ec42d35887252c79568284c4a7a14ac4..78a2be794a3d9577c2404f4ee0dda176deabdb8e 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/mojo/examples/window_manager/window_manager.cc
@@ -113,9 +113,9 @@ class WindowManager : public Application,
if (event->action == ui::ET_MOUSE_RELEASED) {
std::string app_url;
if (event->flags & ui::EF_LEFT_MOUSE_BUTTON)
- app_url = "mojo:mojo_embedded_app";
+ app_url = "mojo://mojo_embedded_app";
else if (event->flags & ui::EF_RIGHT_MOUSE_BUTTON)
- app_url = "mojo:mojo_nesting_app";
+ app_url = "mojo://mojo_nesting_app";
DCHECK(!app_url.empty());
Node* node = view_manager_->GetNodeById(parent_node_id_);
@@ -149,16 +149,12 @@ class WindowManager : public Application,
// Overridden from LauncherClient:
virtual void OnLaunch(
- const mojo::String& handler_url, mojo::URLResponsePtr response,
- mojo::ScopedDataPipeConsumerHandle response_body_stream) OVERRIDE {
+ const mojo::String& requested_url, const mojo::String& handler_url,
+ navigation::ResponseDetailsPtr response) OVERRIDE {
navigation::NavigationDetailsPtr nav_details(
navigation::NavigationDetails::New());
- nav_details->url = response->url;
- navigation::ResponseDetailsPtr response_details(
- navigation::ResponseDetails::New());
- response_details->response = response.Pass();
- response_details->response_body_stream = response_body_stream.Pass();
- CreateWindow(handler_url, nav_details.Pass(), response_details.Pass());
+ nav_details->url = requested_url;
+ CreateWindow(handler_url, nav_details.Pass(), response.Pass());
}
void CreateLauncherUI() {
« no previous file with comments | « no previous file | mojo/mojo_services.gypi » ('j') | mojo/services/public/interfaces/launcher/launcher.mojom » ('J')

Powered by Google App Engine
This is Rietveld 408576698