summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-07-05 18:34:45 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-07-09 13:45:41 +0200
commit1daab3653e56469868656b32fa87b7f9585ec577 (patch)
tree10a9cfe812347ed2582a7f68a7ffdc27726e81c0 /patches
parenta912e57e189847509efd75d8a4563ad8c7aa1079 (diff)
Get rid of the need to export content::GetContentClient()
ContentBrowserClientQt is a singleton which makes it possible to access it from WebContentsViewQt and removes the need for patching chromium. This is similar to how ShellContentBrowserClient is managed in the content shell. Change-Id: I67f35520935388888c7230806ad543a58b3211c3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/0001-My-local-fixes.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/patches/0001-My-local-fixes.patch b/patches/0001-My-local-fixes.patch
index 87a08aab9..ab9e927d7 100644
--- a/patches/0001-My-local-fixes.patch
+++ b/patches/0001-My-local-fixes.patch
@@ -42,19 +42,6 @@ index bed5ff2..992e0d0 100644
public:
virtual ~ContentMainRunner() {}
-diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
-index 4c1d110..ddf6a32 100644
---- a/content/public/common/content_client.h
-+++ b/content/public/common/content_client.h
-@@ -63,7 +63,7 @@ CONTENT_EXPORT void SetContentClient(ContentClient* client);
-
- #if defined(CONTENT_IMPLEMENTATION)
- // Content's embedder API should only be used by content.
--ContentClient* GetContentClient();
-+CONTENT_EXPORT ContentClient* GetContentClient();
- #endif
-
- // Used for tests to override the relevant embedder interfaces. Each method
--
1.8.3