summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/filesystem/main.cc4
-rw-r--r--components/html_viewer/content_handler_impl.cc2
-rw-r--r--components/html_viewer/content_handler_impl.h2
-rw-r--r--components/html_viewer/html_document.cc2
-rw-r--r--components/html_viewer/html_document.h2
-rw-r--r--components/html_viewer/html_document_application_delegate.cc2
-rw-r--r--components/html_viewer/html_document_application_delegate.h6
-rw-r--r--components/html_viewer/layout_test_content_handler_impl.cc2
-rw-r--r--components/html_viewer/layout_test_content_handler_impl.h2
-rw-r--r--components/mus/android_loader.cc6
-rw-r--r--components/mus/android_loader.h6
-rw-r--r--components/pdf_viewer/pdf_viewer.cc12
12 files changed, 24 insertions, 24 deletions
diff --git a/components/filesystem/main.cc b/components/filesystem/main.cc
index b84980e..69be93f 100644
--- a/components/filesystem/main.cc
+++ b/components/filesystem/main.cc
@@ -7,7 +7,7 @@
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
-MojoResult MojoMain(MojoHandle application_request) {
+MojoResult MojoMain(MojoHandle request) {
mojo::ApplicationRunner runner(new filesystem::FileSystemApp());
- return runner.Run(application_request);
+ return runner.Run(request);
}
diff --git a/components/html_viewer/content_handler_impl.cc b/components/html_viewer/content_handler_impl.cc
index 0b3b2ef..aff23ee 100644
--- a/components/html_viewer/content_handler_impl.cc
+++ b/components/html_viewer/content_handler_impl.cc
@@ -23,7 +23,7 @@ ContentHandlerImpl::~ContentHandlerImpl() {
}
void ContentHandlerImpl::StartApplication(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback) {
// HTMLDocumentApplicationDelegate deletes itself.
diff --git a/components/html_viewer/content_handler_impl.h b/components/html_viewer/content_handler_impl.h
index ee52c17..51fa01e 100644
--- a/components/html_viewer/content_handler_impl.h
+++ b/components/html_viewer/content_handler_impl.h
@@ -29,7 +29,7 @@ class ContentHandlerImpl : public mojo::shell::mojom::ContentHandler {
private:
// Overridden from shell::mojom::ContentHandler:
void StartApplication(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback) override;
diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
index fdb4efd..364b394 100644
--- a/components/html_viewer/html_document.cc
+++ b/components/html_viewer/html_document.cc
@@ -27,7 +27,7 @@
#include "components/mus/ws/ids.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/interfaces/shell.mojom.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "ui/gfx/geometry/dip_util.h"
diff --git a/components/html_viewer/html_document.h b/components/html_viewer/html_document.h
index 39dee11..efe7fb1 100644
--- a/components/html_viewer/html_document.h
+++ b/components/html_viewer/html_document.h
@@ -20,7 +20,7 @@
#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
#include "mojo/shell/public/cpp/app_lifetime_helper.h"
#include "mojo/shell/public/cpp/interface_factory.h"
-#include "mojo/shell/public/interfaces/application.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client.mojom.h"
namespace base {
class SingleThreadTaskRunner;
diff --git a/components/html_viewer/html_document_application_delegate.cc b/components/html_viewer/html_document_application_delegate.cc
index e1208d2c..7316202 100644
--- a/components/html_viewer/html_document_application_delegate.cc
+++ b/components/html_viewer/html_document_application_delegate.cc
@@ -54,7 +54,7 @@ class HTMLDocumentApplicationDelegate::ServiceConnectorQueue
};
HTMLDocumentApplicationDelegate::HTMLDocumentApplicationDelegate(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
GlobalState* global_state,
scoped_ptr<mojo::AppRefCount> parent_app_refcount,
diff --git a/components/html_viewer/html_document_application_delegate.h b/components/html_viewer/html_document_application_delegate.h
index 8870021..da9b5b7 100644
--- a/components/html_viewer/html_document_application_delegate.h
+++ b/components/html_viewer/html_document_application_delegate.h
@@ -13,9 +13,9 @@
#include "components/html_viewer/html_factory.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
#include "mojo/shell/public/cpp/shell.h"
#include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
namespace html_viewer {
@@ -27,7 +27,7 @@ class HTMLDocumentApplicationDelegate : public mojo::ShellClient,
public HTMLFactory {
public:
HTMLDocumentApplicationDelegate(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
GlobalState* global_state,
scoped_ptr<mojo::AppRefCount> parent_app_refcount,
@@ -64,7 +64,7 @@ class HTMLDocumentApplicationDelegate : public mojo::ShellClient,
HTMLWidgetRootLocal* CreateHTMLWidgetRootLocal(
HTMLWidgetRootLocal::CreateParams* params) override;
- mojo::ApplicationImpl app_;
+ mojo::ShellConnection app_;
// AppRefCount of the parent (HTMLViewer).
scoped_ptr<mojo::AppRefCount> parent_app_refcount_;
const mojo::String url_;
diff --git a/components/html_viewer/layout_test_content_handler_impl.cc b/components/html_viewer/layout_test_content_handler_impl.cc
index 7683e68..c541e29 100644
--- a/components/html_viewer/layout_test_content_handler_impl.cc
+++ b/components/html_viewer/layout_test_content_handler_impl.cc
@@ -62,7 +62,7 @@ LayoutTestContentHandlerImpl::~LayoutTestContentHandlerImpl() {
}
void LayoutTestContentHandlerImpl::StartApplication(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback) {
test_interfaces_->SetTestIsRunning(true);
diff --git a/components/html_viewer/layout_test_content_handler_impl.h b/components/html_viewer/layout_test_content_handler_impl.h
index 50f6b5c..5c39e25 100644
--- a/components/html_viewer/layout_test_content_handler_impl.h
+++ b/components/html_viewer/layout_test_content_handler_impl.h
@@ -39,7 +39,7 @@ class LayoutTestContentHandlerImpl : public ContentHandlerImpl,
// ContentHandler:
void StartApplication(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback) override;
diff --git a/components/mus/android_loader.cc b/components/mus/android_loader.cc
index eeaddf4..0e9e5d8 100644
--- a/components/mus/android_loader.cc
+++ b/components/mus/android_loader.cc
@@ -5,7 +5,7 @@
#include "components/mus/android_loader.h"
#include "components/mus/mus_app.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
namespace mus {
@@ -14,9 +14,9 @@ AndroidLoader::~AndroidLoader() {}
void AndroidLoader::Load(
const GURL& url,
- mojo::InterfaceRequest<mojo::shell::mojom::Application> request) {
+ mojo::InterfaceRequest<mojo::shell::mojom::ShellClient> request) {
DCHECK(request.is_pending());
- app_.reset(new mojo::ApplicationImpl(new MandolineUIServicesApp,
+ app_.reset(new mojo::ShellConnection(new MandolineUIServicesApp,
std::move(request)));
}
diff --git a/components/mus/android_loader.h b/components/mus/android_loader.h
index 7ff605d..88270f2 100644
--- a/components/mus/android_loader.h
+++ b/components/mus/android_loader.h
@@ -9,7 +9,7 @@
#include "mojo/shell/application_loader.h"
namespace mojo {
-class ApplicationImpl;
+class ShellConnection;
}
namespace mus {
@@ -23,9 +23,9 @@ class AndroidLoader : public mojo::shell::ApplicationLoader {
// Overridden from mojo::shell::ApplicationLoader:
void Load(
const GURL& url,
- mojo::InterfaceRequest<mojo::shell::mojom::Application> request) override;
+ mojo::InterfaceRequest<mojo::shell::mojom::ShellClient> request) override;
- scoped_ptr<mojo::ApplicationImpl> app_;
+ scoped_ptr<mojo::ShellConnection> app_;
DISALLOW_COPY_AND_ASSIGN(AndroidLoader);
};
diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc
index 1fa2984..ba16212 100644
--- a/components/pdf_viewer/pdf_viewer.cc
+++ b/components/pdf_viewer/pdf_viewer.cc
@@ -27,10 +27,10 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_impl.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "mojo/shell/public/cpp/interface_factory_impl.h"
#include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/interfaces/content_handler.mojom.h"
#include "mojo/shell/public/interfaces/shell.mojom.h"
#include "third_party/pdfium/public/fpdf_ext.h"
@@ -242,7 +242,7 @@ class PDFViewerApplicationDelegate
public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
public:
PDFViewerApplicationDelegate(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback)
: app_(this,
@@ -305,7 +305,7 @@ class PDFViewerApplicationDelegate
mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
}
- mojo::ApplicationImpl app_;
+ mojo::ShellConnection app_;
std::string data_;
std::vector<PDFView*> pdf_views_;
FPDF_DOCUMENT doc_;
@@ -325,7 +325,7 @@ class ContentHandlerImpl : public mojo::shell::mojom::ContentHandler {
private:
// mojo::shell::mojom::ContentHandler:
void StartApplication(
- mojo::ApplicationRequest request,
+ mojo::ShellClientRequest request,
mojo::URLResponsePtr response,
const mojo::Callback<void()>& destruct_callback) override {
new PDFViewerApplicationDelegate(std::move(request), std::move(response),
@@ -374,7 +374,7 @@ class PDFViewer
} // namespace
} // namespace pdf_viewer
-MojoResult MojoMain(MojoHandle application_request) {
+MojoResult MojoMain(MojoHandle request) {
mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
- return runner.Run(application_request);
+ return runner.Run(request);
}
generated by cgit v1.1 at 2025-01-27 12:56:52 +0000