summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/appcache_backend_impl.h3
-rw-r--r--webkit/appcache/appcache_export.h27
-rw-r--r--webkit/appcache/appcache_frontend_impl.h5
-rw-r--r--webkit/appcache/appcache_interceptor.h4
-rw-r--r--webkit/appcache/appcache_interfaces.h11
-rw-r--r--webkit/appcache/appcache_service.h5
-rw-r--r--webkit/appcache/view_appcache_internals_job.h3
-rw-r--r--webkit/appcache/web_application_cache_host_impl.h4
-rw-r--r--webkit/appcache/webkit_appcache.gypi10
9 files changed, 13 insertions, 59 deletions
diff --git a/webkit/appcache/appcache_backend_impl.h b/webkit/appcache/appcache_backend_impl.h
index 67e7e99..9a0e1ae 100644
--- a/webkit/appcache/appcache_backend_impl.h
+++ b/webkit/appcache/appcache_backend_impl.h
@@ -6,14 +6,13 @@
#define WEBKIT_APPCACHE_APPCACHE_BACKEND_IMPL_H_
#include "base/hash_tables.h"
-#include "webkit/appcache/appcache_export.h"
#include "webkit/appcache/appcache_host.h"
namespace appcache {
class AppCacheService;
-class APPCACHE_EXPORT AppCacheBackendImpl {
+class AppCacheBackendImpl {
public:
AppCacheBackendImpl();
~AppCacheBackendImpl();
diff --git a/webkit/appcache/appcache_export.h b/webkit/appcache/appcache_export.h
deleted file mode 100644
index 130816a..0000000
--- a/webkit/appcache/appcache_export.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011 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 WEBKIT_APPCACHE_APPCACHE_EXPORT_H_
-#define WEBKIT_APPCACHE_APPCACHE_EXPORT_H_
-#pragma once
-
-// TODO(dpranke): Uncomment to enable appcache component build.
-#if 0 // defined(COMPONENT_BUILD)
-#if defined(WIN32)
-
-#if defined(APPCACHE_IMPLEMENTATION)
-#define APPCACHE_EXPORT __declspec(dllexport)
-#else
-#define APPCACHE_EXPORT __declspec(dllimport)
-#endif // defined(APPCACHE_IMPLEMENTATION)
-
-#else // defined(WIN32)
-#define APPCACHE_EXPORT __attribute__((visibility("default")))
-#endif
-
-#else // defined(COMPONENT_BUILD)
-#define APPCACHE_EXPORT
-#endif
-
-#endif // WEBKIT_APPCACHE_APPCACHE_EXPORT_H_
diff --git a/webkit/appcache/appcache_frontend_impl.h b/webkit/appcache/appcache_frontend_impl.h
index ce37d26..159cbec 100644
--- a/webkit/appcache/appcache_frontend_impl.h
+++ b/webkit/appcache/appcache_frontend_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,12 +7,11 @@
#include <string>
#include <vector>
-#include "webkit/appcache/appcache_export.h"
#include "webkit/appcache/appcache_interfaces.h"
namespace appcache {
-class APPCACHE_EXPORT AppCacheFrontendImpl : public AppCacheFrontend {
+class AppCacheFrontendImpl : public AppCacheFrontend {
public:
virtual void OnCacheSelected(
int host_id, const appcache::AppCacheInfo& info);
diff --git a/webkit/appcache/appcache_interceptor.h b/webkit/appcache/appcache_interceptor.h
index 423fd65..1ddd7d2 100644
--- a/webkit/appcache/appcache_interceptor.h
+++ b/webkit/appcache/appcache_interceptor.h
@@ -8,7 +8,6 @@
#include "base/memory/singleton.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request.h"
-#include "webkit/appcache/appcache_export.h"
#include "webkit/glue/resource_type.h"
namespace appcache {
@@ -18,8 +17,7 @@ class AppCacheService;
// An interceptor to hijack requests and potentially service them out of
// the appcache.
-class APPCACHE_EXPORT AppCacheInterceptor
- : public net::URLRequest::Interceptor {
+class AppCacheInterceptor : public net::URLRequest::Interceptor {
public:
// Registers a singleton instance with the net library.
// Should be called early in the IO thread prior to initiating requests.
diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h
index 70baf3a..d04a7da 100644
--- a/webkit/appcache/appcache_interfaces.h
+++ b/webkit/appcache/appcache_interfaces.h
@@ -11,7 +11,6 @@
#include "base/file_path.h"
#include "base/time.h"
#include "googleurl/src/gurl.h"
-#include "webkit/appcache/appcache_export.h"
namespace net {
class URLRequest;
@@ -55,7 +54,7 @@ enum LogLevel {
LOG_ERROR,
};
-struct APPCACHE_EXPORT AppCacheInfo {
+struct AppCacheInfo {
AppCacheInfo();
~AppCacheInfo();
@@ -72,7 +71,7 @@ struct APPCACHE_EXPORT AppCacheInfo {
typedef std::vector<AppCacheInfo> AppCacheInfoVector;
// Type to hold information about a single appcache resource.
-struct APPCACHE_EXPORT AppCacheResourceInfo {
+struct AppCacheResourceInfo {
AppCacheResourceInfo();
~AppCacheResourceInfo();
@@ -89,7 +88,7 @@ struct APPCACHE_EXPORT AppCacheResourceInfo {
typedef std::vector<AppCacheResourceInfo> AppCacheResourceInfoVector;
// Interface used by backend (browser-process) to talk to frontend (renderer).
-class APPCACHE_EXPORT AppCacheFrontend {
+class AppCacheFrontend {
public:
virtual void OnCacheSelected(
int host_id, const appcache::AppCacheInfo& info) = 0;
@@ -110,7 +109,7 @@ class APPCACHE_EXPORT AppCacheFrontend {
};
// Interface used by frontend (renderer) to talk to backend (browser-process).
-class APPCACHE_EXPORT AppCacheBackend {
+class AppCacheBackend {
public:
virtual void RegisterHost(int host_id) = 0;
virtual void UnregisterHost(int host_id) = 0;
@@ -150,7 +149,7 @@ bool IsSchemeSupported(const GURL& url);
bool IsMethodSupported(const std::string& method);
bool IsSchemeAndMethodSupported(const net::URLRequest* request);
-APPCACHE_EXPORT extern const FilePath::CharType kAppCacheDatabaseName[];
+extern const FilePath::CharType kAppCacheDatabaseName[];
} // namespace
diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index f8bc5b7..2b8cdd4 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/appcache/appcache_service.h
@@ -14,7 +14,6 @@
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
-#include "webkit/appcache/appcache_export.h"
#include "webkit/appcache/appcache_interfaces.h"
#include "webkit/appcache/appcache_storage.h"
@@ -40,7 +39,7 @@ class AppCacheQuotaClient;
class AppCachePolicy;
// Refcounted container to avoid copying the collection in callbacks.
-struct APPCACHE_EXPORT AppCacheInfoCollection
+struct AppCacheInfoCollection
: public base::RefCountedThreadSafe<AppCacheInfoCollection> {
AppCacheInfoCollection();
virtual ~AppCacheInfoCollection();
@@ -51,7 +50,7 @@ struct APPCACHE_EXPORT AppCacheInfoCollection
// Class that manages the application cache service. Sends notifications
// to many frontends. One instance per user-profile. Each instance has
// exclusive access to it's cache_directory on disk.
-class APPCACHE_EXPORT AppCacheService {
+class AppCacheService {
public:
// If not using quota management, the proxy may be NULL.
explicit AppCacheService(quota::QuotaManagerProxy* quota_manager_proxy);
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h
index 762a703..2d45c51 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/appcache/view_appcache_internals_job.h
@@ -6,7 +6,6 @@
#define WEBKIT_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
#include "base/basictypes.h"
-#include "webkit/appcache/appcache_export.h"
namespace net {
class URLRequest;
@@ -17,7 +16,7 @@ namespace appcache {
class AppCacheService;
-class APPCACHE_EXPORT ViewAppCacheInternalsJobFactory {
+class ViewAppCacheInternalsJobFactory {
public:
static net::URLRequestJob* CreateJobForRequest(
net::URLRequest* request, AppCacheService* service);
diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h
index 7595a5d..7b6789a 100644
--- a/webkit/appcache/web_application_cache_host_impl.h
+++ b/webkit/appcache/web_application_cache_host_impl.h
@@ -11,7 +11,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebApplicationCacheHostClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
-#include "webkit/appcache/appcache_export.h"
#include "webkit/appcache/appcache_interfaces.h"
namespace WebKit {
@@ -20,8 +19,7 @@ class WebFrame;
namespace appcache {
-class APPCACHE_EXPORT WebApplicationCacheHostImpl
- : NON_EXPORTED_BASE(public WebKit::WebApplicationCacheHost) {
+class WebApplicationCacheHostImpl : public WebKit::WebApplicationCacheHost {
public:
// Returns the host having given id or NULL if there is no such host.
static WebApplicationCacheHostImpl* FromId(int id);
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 6c46d1a..cfce447 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -6,20 +6,11 @@
'targets': [
{
'target_name': 'appcache',
- # TODO(dpranke): Uncomment '<(component)',
- # 'type': '<(component)',
'type': 'static_library',
- 'defines': [
- 'APPCACHE_IMPLEMENTATION',
- ],
'dependencies': [
- 'quota',
- '<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/sql/sql.gyp:sql',
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
# This list contains all .h and .cc in appcache except for test code.
@@ -32,7 +23,6 @@
'appcache_disk_cache.cc',
'appcache_disk_cache.h',
'appcache_entry.h',
- 'appcache_export.h',
'appcache_frontend_impl.cc',
'appcache_frontend_impl.h',
'appcache_group.cc',
generated by cgit v1.1 at 2025-01-18 13:22:55 +0000