summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-20 15:30:42 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-20 15:30:42 -0400
commit114cc12ee97de86964cb03d305a473de008bd54e (patch)
treea5d5bb8d0ae58b0a806f42d5539c559cedd7509f
parent20a3f8c006445b176fa8559f6529c2cf3cb75b0d (diff)
downloadUXP-114cc12ee97de86964cb03d305a473de008bd54e.tar
UXP-114cc12ee97de86964cb03d305a473de008bd54e.tar.gz
UXP-114cc12ee97de86964cb03d305a473de008bd54e.tar.lz
UXP-114cc12ee97de86964cb03d305a473de008bd54e.tar.xz
UXP-114cc12ee97de86964cb03d305a473de008bd54e.zip
Un-deprecate nsNavHistory::GetPageTitle and nsNavBookmarks::GetURIForKeyword
-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);