Fixes for rebase

brave · Nov 19, 2020 · 71d01f4 · 71d01f4
1 parent b88c2a9
commit 71d01f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/chromium_src/content/browser/browser_context.cc b/chromium_src/content/browser/browser_context.cc
@@ -38,5 +38,12 @@ std::string GetSessionStorageNamespaceId(WebContents* web_contents) {
 
 }  // namespace content
 
+
+namespace content {
+bool BrowserContext::IsTor() const {
+  return false;
+}
+}  // namespace content
+
 #include "../../../../content/browser/browser_context.cc"
 #include "brave/chromium_src/content/browser/tld_ephemeral_storage.cc"
diff --git a/chromium_src/content/public/browser/browser_context.h b/chromium_src/content/public/browser/browser_context.h
@@ -6,7 +6,11 @@
 #ifndef BRAVE_CHROMIUM_SRC_CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 #define BRAVE_CHROMIUM_SRC_CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 
+#define IsOffTheRecord IsTor() const; \
+    virtual bool IsOffTheRecord
 #include "../../../../../content/public/browser/browser_context.h"
+#undef IsOffTheRecord
+
 #include "brave/chromium_src/content/public/browser/tld_ephemeral_storage.h"
 
 #include <string>