Nuke MOJO_APPLICATION_MANAGER_EXPORT. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/976823004
diff --git a/shell/android/background_application_loader.h b/shell/android/background_application_loader.h index 5307767..8baacbb 100644 --- a/shell/android/background_application_loader.h +++ b/shell/android/background_application_loader.h
@@ -14,7 +14,7 @@ namespace mojo { -class MOJO_APPLICATION_MANAGER_EXPORT BackgroundApplicationLoader +class BackgroundApplicationLoader : public ApplicationLoader, public base::DelegateSimpleThread::Delegate { public:
diff --git a/shell/application_manager/BUILD.gn b/shell/application_manager/BUILD.gn index 90cc8de..5bc0bf6 100644 --- a/shell/application_manager/BUILD.gn +++ b/shell/application_manager/BUILD.gn
@@ -11,7 +11,6 @@ "application_loader.h", "application_manager.cc", "application_manager.h", - "application_manager_export.h", "data_pipe_peek.cc", "data_pipe_peek.h", "local_fetcher.cc",
diff --git a/shell/application_manager/application_loader.h b/shell/application_manager/application_loader.h index 0aa985a..95a1b78 100644 --- a/shell/application_manager/application_loader.h +++ b/shell/application_manager/application_loader.h
@@ -9,7 +9,6 @@ #include "mojo/public/cpp/system/core.h" #include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "shell/application_manager/application_manager_export.h" #include "url/gurl.h" namespace mojo { @@ -19,7 +18,7 @@ // Interface to implement special application loading behavior for a particular // URL or scheme. -class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader { +class ApplicationLoader { public: virtual ~ApplicationLoader() {}
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h index cce6089..ac01fff 100644 --- a/shell/application_manager/application_manager.h +++ b/shell/application_manager/application_manager.h
@@ -17,7 +17,6 @@ #include "mojo/public/interfaces/application/service_provider.mojom.h" #include "mojo/services/network/public/interfaces/network_service.mojom.h" #include "shell/application_manager/application_loader.h" -#include "shell/application_manager/application_manager_export.h" #include "shell/application_manager/fetcher.h" #include "shell/application_manager/shell_impl.h" #include "url/gurl.h" @@ -31,9 +30,9 @@ // ApplicationManager requires implementations of NativeRunner and // NativeRunnerFactory to run native applications. -class MOJO_APPLICATION_MANAGER_EXPORT NativeRunner { +class NativeRunner { public: - // Parameter for |Start| to specify its cleanup behavior. + // Parameter for |Start()| to specify its cleanup behavior. enum CleanupBehavior { DeleteAppPath, DontDeleteAppPath }; virtual ~NativeRunner() {} @@ -47,15 +46,15 @@ const base::Closure& app_completed_callback) = 0; }; -class MOJO_APPLICATION_MANAGER_EXPORT NativeRunnerFactory { +class NativeRunnerFactory { public: virtual ~NativeRunnerFactory() {} virtual scoped_ptr<NativeRunner> Create() = 0; }; -class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager { +class ApplicationManager { public: - class MOJO_APPLICATION_MANAGER_EXPORT Delegate { + class Delegate { public: virtual ~Delegate(); // Send when the Application holding the handle on the other end of the @@ -66,7 +65,7 @@ }; // API for testing. - class MOJO_APPLICATION_MANAGER_EXPORT TestAPI { + class TestAPI { public: explicit TestAPI(ApplicationManager* manager); ~TestAPI();
diff --git a/shell/application_manager/application_manager_export.h b/shell/application_manager/application_manager_export.h deleted file mode 100644 index 7b3f357..0000000 --- a/shell/application_manager/application_manager_export.h +++ /dev/null
@@ -1,32 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_ -#define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_ - -#if defined(COMPONENT_BUILD) - -#if defined(WIN32) - -#if defined(MOJO_APPLICATION_MANAGER_IMPLEMENTATION) -#define MOJO_APPLICATION_MANAGER_EXPORT __declspec(dllexport) -#else -#define MOJO_APPLICATION_MANAGER_EXPORT __declspec(dllimport) -#endif - -#else // !defined(WIN32) - -#if defined(MOJO_APPLICATION_MANAGER_IMPLEMENTATION) -#define MOJO_APPLICATION_MANAGER_EXPORT __attribute__((visibility("default"))) -#else -#define MOJO_APPLICATION_MANAGER_EXPORT -#endif - -#endif // defined(WIN32) - -#else // !defined(COMPONENT_BUILD) -#define MOJO_APPLICATION_MANAGER_EXPORT -#endif - -#endif // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_EXPORT_H_