diff options
| -rw-r--r-- | chrome/browser/DEPS | 1 | ||||
| -rw-r--r-- | chrome/browser/sandbox_policy.h | 1 | ||||
| -rw-r--r-- | webkit/glue/glue_serialize.h | 12 |
3 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 5308c41..e324a90 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -10,7 +10,6 @@ include_rules = [ "+sandbox/src", "+skia/include", "+skia/ext", - "+webkit/activex_shim", "+webkit/default_plugin", "+webkit/glue", # Defines some types that are marshalled over IPC. diff --git a/chrome/browser/sandbox_policy.h b/chrome/browser/sandbox_policy.h index 393e4bf..18f58a8 100644 --- a/chrome/browser/sandbox_policy.h +++ b/chrome/browser/sandbox_policy.h @@ -9,7 +9,6 @@ #include "base/file_path.h" #include "sandbox/src/sandbox.h" -#include "webkit/activex_shim/activex_shared.h" // Adds the generic policy rules to a sandbox TargetPolicy. bool AddGenericPolicy(sandbox::TargetPolicy* policy); diff --git a/webkit/glue/glue_serialize.h b/webkit/glue/glue_serialize.h index 75422e2..eaa3f6d 100644 --- a/webkit/glue/glue_serialize.h +++ b/webkit/glue/glue_serialize.h @@ -10,26 +10,26 @@ #ifndef WEBKIT_GLUE_GLUE_SERIALIZE_H__ #define WEBKIT_GLUE_GLUE_SERIALIZE_H__ -#include "PassRefPtr.h" -#include "RefPtr.h" - namespace WebCore { class String; class HistoryItem; } +namespace WTF { +template<typename T> class PassRefPtr; +} namespace webkit_glue { // HistoryItem serialization. The returned HistoryItem will have a ref count // of 0, so the first RefPtr it is assigned to will take ownership. The empty // string corresponds with a NULL HistoryItem. void HistoryItemToString( - PassRefPtr<WebCore::HistoryItem> item, std::string* serialized_item); -PassRefPtr<WebCore::HistoryItem> HistoryItemFromString( + WTF::PassRefPtr<WebCore::HistoryItem> item, std::string* serialized_item); +WTF::PassRefPtr<WebCore::HistoryItem> HistoryItemFromString( const std::string& serialized_item); // For testing purposes only. void HistoryItemToVersionedString( - PassRefPtr<WebCore::HistoryItem> item, int version, + WTF::PassRefPtr<WebCore::HistoryItem> item, int version, std::string* serialized_item); } |