bug 415117 - get rid of chrome://browser in toolkit places, r=Mano a=schrep

browser/locales/en-US/chrome/browser/places/places.properties

@@ -3,22 +3,12 @@ deleteDomain=Delete entire domain %S
 deleteHostNoSelection=Delete host
 deleteDomainNoSelection=Delete domain
 
-finduri-AgeInDays-is-0=Today
-finduri-AgeInDays-is-1=Yesterday
-finduri-AgeInDays-is=%S days ago
-finduri-AgeInDays-isgreater=Older than %S days
-
-finduri-Hostname-is-=(no host)
-
 load-js-data-url-error=For security reasons, javascript or data urls cannot be loaded from the history window or sidebar.
 noTitle=(no title)
-localhost=(local files)
 
 bookmarksMenuName=Bookmarks Menu
 bookmarksToolbarName=Bookmarks Toolbar
 bookmarksMenuEmptyFolder=(Empty)
-bookmarksLivemarkLoading=Live Bookmark loading…
-bookmarksLivemarkFailed=Live Bookmark feed failed to load.
 
 # LOCALIZATION NOTE (bookmarksBackupFilename) :
 # %S will be replaced by the current date in ISO 8601 format, YYYY-MM-DD.

browser/themes/gnomestripe/browser/jar.mn

@@ -36,7 +36,6 @@ classic.jar:
 * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
   skin/classic/browser/places/livemark-folder.png     (places/livemark-folder.png)
   skin/classic/browser/places/livemark-folder-rtl.png (places/livemark-folder-rtl.png)
-  skin/classic/browser/places/livemarkItem.png        (places/livemarkItem.png)
   skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)
   skin/classic/browser/places/livemark-item-rtl.png   (places/livemark-item-rtl.png)
   skin/classic/browser/places/pageStarred.png         (places/pageStarred.png)

browser/themes/winstripe/browser/jar.mn

@@ -39,7 +39,6 @@ classic.jar:
         skin/classic/browser/places/places.css                  (places/places.css)
         skin/classic/browser/places/organizer.css               (places/organizer.css)
         skin/classic/browser/places/query.png                   (places/query.png)
-        skin/classic/browser/places/livemarkItem.png            (places/livemarkItem.png)
         skin/classic/browser/places/bookmarksMenu.png           (places/bookmarksMenu.png)
         skin/classic/browser/places/bookmarksToolbar.png        (places/bookmarksToolbar.png)
         skin/classic/browser/places/toolbarDropMarker.png       (places/toolbarDropMarker.png)

toolkit/components/places/src/nsLivemarkService.js

@@ -59,8 +59,7 @@ const LS_CLASSNAME = "Livemark Service";
 const LS_CONTRACTID = "@mozilla.org/browser/livemark-service;2";
 
 const LIVEMARK_TIMEOUT = 15000; // fire every 15 seconds
-const LIVEMARK_ICON_URI = "chrome://browser/skin/places/livemarkItem.png";
-const PLACES_BUNDLE_URI = "chrome://browser/locale/places/places.properties";
+const PLACES_BUNDLE_URI = "chrome://places/locale/places.properties";
 const DEFAULT_LOAD_MSG = "Live Bookmark loading...";
 const DEFAULT_FAIL_MSG = "Live Bookmark feed failed to load.";
 const LMANNO_FEEDURI = "livemark/feedURI";
@@ -141,7 +140,6 @@ function LivemarkService() {
   // [ {folderId:, folderURI:, feedURI:, loadGroup:, locked: } ];
   this._livemarks = [];
 
-  this._iconURI = gIoService.newURI(LIVEMARK_ICON_URI, null, null);
   this._loading = GetString("bookmarksLivemarkLoading") || DEFAULT_LOAD_MSG;
   this._observerServiceObserver =
     new G_ObserverServiceObserver('xpcom-shutdown',

toolkit/components/places/src/nsNavHistory.cpp

@@ -407,7 +407,7 @@ nsNavHistory::Init()
     do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = bundleService->CreateBundle(
-      "chrome://browser/locale/places/places.properties",
+      "chrome://places/locale/places.properties",
       getter_AddRefs(mBundle));
   NS_ENSURE_SUCCESS(rv, rv);
 

toolkit/locales/en-US/chrome/places/places.properties

@@ -2,3 +2,13 @@ BookmarksMenuFolderTitle=Bookmarks Menu
 BookmarksToolbarFolderTitle=Bookmarks Toolbar
 UnfiledBookmarksFolderTitle=Unfiled Bookmarks
 TagsFolderTitle=Tags
+
+bookmarksLivemarkLoading=Live Bookmark loading…
+bookmarksLivemarkFailed=Live Bookmark feed failed to load.
+
+finduri-AgeInDays-is-0=Today
+finduri-AgeInDays-is-1=Yesterday
+finduri-AgeInDays-is=%S days ago
+finduri-AgeInDays-isgreater=Older than %S days
+
+localhost=(local files)