summaryrefslogtreecommitdiffstats
path: root/toolkit/components/places
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-21 18:53:06 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-21 18:53:06 +0200
commit306690e137c2bb031020ba3c2c1515ba731a23a5 (patch)
tree81b242212f693af25c350668e3b72efbce9b224a /toolkit/components/places
parent4549256c2b685782587f2ccad6a105c0392492c7 (diff)
parent0a744b1cfeecdd2487d9166792ac5234edc9ee6a (diff)
downloadUXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar
UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.gz
UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.lz
UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.tar.xz
UXP-306690e137c2bb031020ba3c2c1515ba731a23a5.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into data-transfer_1
Diffstat (limited to 'toolkit/components/places')
-rw-r--r--toolkit/components/places/nsNavBookmarks.cpp2
-rw-r--r--toolkit/components/places/nsNavHistory.cpp2
2 files changed, 0 insertions, 4 deletions
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index 74707be99..693aaf5db 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -2518,8 +2518,6 @@ nsNavBookmarks::GetURIForKeyword(const nsAString& aUserCasedKeyword,
NS_ENSURE_TRUE(!aUserCasedKeyword.IsEmpty(), NS_ERROR_INVALID_ARG);
*aURI = nullptr;
- PLACES_WARN_DEPRECATED();
-
// Shortcuts are always lowercased internally.
nsAutoString keyword(aUserCasedKeyword);
ToLowerCase(keyword);
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index 7f4007c1a..49d911d65 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -2796,8 +2796,6 @@ nsNavHistory::MarkPageAsFollowedLink(nsIURI *aURI)
NS_IMETHODIMP
nsNavHistory::GetPageTitle(nsIURI* aURI, nsAString& aTitle)
{
- PLACES_WARN_DEPRECATED();
-
NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
NS_ENSURE_ARG(aURI);