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

Unified Diff: content/common/mojo/service_registry_impl.h

Issue 1262613005: Remove interface_impl.h and error_handler.h usage from chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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: content/common/mojo/service_registry_impl.h
diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
index c2346766286a456642d046ae8f6b87eadff6b5ec..b25ade991907b4ff55e2d2522820b7fae3755591 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -16,15 +16,13 @@
#include "content/public/common/service_registry.h"
#include "mojo/application/public/interfaces/service_provider.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
namespace content {
class CONTENT_EXPORT ServiceRegistryImpl
: public ServiceRegistry,
- public NON_EXPORTED_BASE(mojo::ServiceProvider),
- public NON_EXPORTED_BASE(mojo::ErrorHandler) {
+ public NON_EXPORTED_BASE(mojo::ServiceProvider) {
public:
ServiceRegistryImpl();
~ServiceRegistryImpl() override;
@@ -55,8 +53,7 @@ class CONTENT_EXPORT ServiceRegistryImpl
void ConnectToService(const mojo::String& name,
mojo::ScopedMessagePipeHandle client_handle) override;
- // mojo::ErrorHandler overrides.
- void OnConnectionError() override;
+ void OnConnectionError();
mojo::Binding<mojo::ServiceProvider> binding_;
mojo::ServiceProviderPtr remote_provider_;
« no previous file with comments | « content/browser/permissions/permission_service_impl.cc ('k') | content/common/mojo/service_registry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698