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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 1074963002: Add some |using mojo::...;|s to //shell .cc files. (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
« no previous file with comments | « shell/application_manager/application_manager_unittest.cc ('k') | shell/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/application_manager/shell_impl.cc
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index 1c0d5332ffc0f13aa73012314f883fd38ea212c7..0384ed7bc7feccffe2efb195be8bd5e0551baf54 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -8,6 +8,9 @@
#include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
#include "shell/application_manager/application_manager.h"
+using mojo::ServiceProvider;
+using mojo::ServiceProviderPtr;
+
namespace shell {
ShellImpl::ShellImpl(mojo::ApplicationPtr application,
@@ -34,8 +37,8 @@ void ShellImpl::InitializeApplication(mojo::Array<mojo::String> args) {
void ShellImpl::ConnectToClient(
const GURL& requested_url,
const GURL& requestor_url,
- mojo::InterfaceRequest<mojo::ServiceProvider> services,
- mojo::ServiceProviderPtr exposed_services) {
+ mojo::InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services) {
application_->AcceptConnection(mojo::String::From(requestor_url),
services.Pass(), exposed_services.Pass(),
requested_url.spec());
@@ -44,8 +47,8 @@ void ShellImpl::ConnectToClient(
// Shell implementation:
void ShellImpl::ConnectToApplication(
const mojo::String& app_url,
- mojo::InterfaceRequest<mojo::ServiceProvider> services,
- mojo::ServiceProviderPtr exposed_services) {
+ mojo::InterfaceRequest<ServiceProvider> services,
+ ServiceProviderPtr exposed_services) {
GURL app_gurl(app_url);
if (!app_gurl.is_valid()) {
LOG(ERROR) << "Error: invalid URL: " << app_url;
« no previous file with comments | « shell/application_manager/application_manager_unittest.cc ('k') | shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698