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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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: shell/application_manager/shell_impl.cc
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index 76c54da298cd2188866b8c2f7ef2e53ca731b53c..1c0d5332ffc0f13aa73012314f883fd38ea212c7 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -8,10 +8,9 @@
#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
#include "shell/application_manager/application_manager.h"
-namespace mojo {
namespace shell {
-ShellImpl::ShellImpl(ApplicationPtr application,
+ShellImpl::ShellImpl(mojo::ApplicationPtr application,
ApplicationManager* manager,
const Identity& identity,
const base::Closure& on_application_end)
@@ -26,24 +25,27 @@ ShellImpl::ShellImpl(ApplicationPtr application,
ShellImpl::~ShellImpl() {
}
-void ShellImpl::InitializeApplication(Array<String> args) {
- ShellPtr shell;
- binding_.Bind(GetProxy(&shell));
+void ShellImpl::InitializeApplication(mojo::Array<mojo::String> args) {
+ mojo::ShellPtr shell;
+ binding_.Bind(mojo::GetProxy(&shell));
application_->Initialize(shell.Pass(), args.Pass(), identity_.url.spec());
}
-void ShellImpl::ConnectToClient(const GURL& requested_url,
- const GURL& requestor_url,
- InterfaceRequest<ServiceProvider> services,
- ServiceProviderPtr exposed_services) {
- application_->AcceptConnection(String::From(requestor_url), services.Pass(),
- exposed_services.Pass(), requested_url.spec());
+void ShellImpl::ConnectToClient(
+ const GURL& requested_url,
+ const GURL& requestor_url,
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) {
+ application_->AcceptConnection(mojo::String::From(requestor_url),
+ services.Pass(), exposed_services.Pass(),
+ requested_url.spec());
}
// Shell implementation:
-void ShellImpl::ConnectToApplication(const String& app_url,
- InterfaceRequest<ServiceProvider> services,
- ServiceProviderPtr exposed_services) {
+void ShellImpl::ConnectToApplication(
+ const mojo::String& app_url,
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) {
GURL app_gurl(app_url);
if (!app_gurl.is_valid()) {
LOG(ERROR) << "Error: invalid URL: " << app_url;
@@ -58,4 +60,3 @@ void ShellImpl::OnConnectionError() {
}
} // namespace shell
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698