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

Unified Diff: mojo/services/launcher/launcher.cc

Issue 413353002: Remove extraneous namespaces (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: mojo/services/launcher/launcher.cc
diff --git a/mojo/services/launcher/launcher.cc b/mojo/services/launcher/launcher.cc
index 374d91222b1da1a32833742aab95fb1e7bd60b91..29cec8022702940091a894725f1d3d12fec31869 100644
--- a/mojo/services/launcher/launcher.cc
+++ b/mojo/services/launcher/launcher.cc
@@ -18,12 +18,11 @@
#include "url/gurl.h"
namespace mojo {
-namespace launcher {
namespace {
typedef mojo::Callback<void(String handler_url, String view_url,
- navigation::ResponseDetailsPtr response)> LaunchCallback;
+ ResponseDetailsPtr response)> LaunchCallback;
}
@@ -135,8 +134,7 @@ void LauncherConnection::Launch(const String& url_string,
// For Mojo URLs, the handler can always be found at the origin.
// TODO(aa): Return error for invalid URL?
if (url.is_valid() && url.SchemeIs("mojo")) {
- callback.Run(url.GetOrigin().spec(), url_string,
- navigation::ResponseDetailsPtr());
+ callback.Run(url.GetOrigin().spec(), url_string, ResponseDetailsPtr());
return;
}
new LaunchInstance(app_, callback, url_string);
@@ -166,8 +164,7 @@ void LaunchInstance::OnReceivedResponse(URLResponsePtr response) {
if (handler_url.empty()) {
DLOG(WARNING) << "No handler for content type: " << content_type;
} else {
- navigation::ResponseDetailsPtr nav_response(
- navigation::ResponseDetails::New());
+ ResponseDetailsPtr nav_response(ResponseDetails::New());
nav_response->loader = url_loader_.Pass();
nav_response->response = response.Pass();
String response_url = nav_response->response->url;
@@ -177,11 +174,9 @@ void LaunchInstance::OnReceivedResponse(URLResponsePtr response) {
ScheduleDestroy();
}
-} // namespace launcher
-
// static
ApplicationDelegate* ApplicationDelegate::Create() {
- return new launcher::LauncherApp;
+ return new LauncherApp;
}
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698