Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 2a216165e361 (bug 589613), a=shutuphook

Browse Source
This commit is contained in:
Gavin Sharp 2010-09-11 13:46:39 -04:00
parent 9a5a350f44
commit b117494ed3
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docshell/base/nsDefaultURIFixup.cpp
View File

@ -48,10 +48,7 @@
#include "nsIPrefLocalizedString.h"
#include "nsIPlatformCharset.h"
#include "nsILocalFile.h"
#ifdef MOZ_TOOLKIT_SEARCH
#include "nsIBrowserSearchService.h"
#endif
#include "nsIURIFixup.h"
#include "nsDefaultURIFixup.h"
@ -402,7 +399,6 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
return NS_NewURI(aURI, spec);
}
#ifdef MOZ_TOOLKIT_SEARCH
// Try falling back to the search service's default search engine
nsCOMPtr<nsIBrowserSearchService> searchSvc = do_GetService("@mozilla.org/browser/search-service;1");
if (searchSvc) {
@ -440,7 +436,6 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
}
}
}
#endif
// out of options
return NS_ERROR_NOT_AVAILABLE;

5
netwerk/base/public/Makefile.in
View File

@ -141,12 +141,9 @@ XPIDLSRCS = \
nsIURIWithPrincipal.idl \
nsIURIClassifier.idl \
nsIRedirectResultListener.idl \
nsIBrowserSearchService.idl \
$(NULL)
ifdef MOZ_TOOLKIT_SEARCH
XPIDLSRCS += nsIBrowserSearchService.idl
endif
EXPORTS = \
netCore.h \
nsNetError.h \