diff -r 786160610b4d -r afcd8e6d025b ginebra2/ChromeWidget.cpp
--- a/ginebra2/ChromeWidget.cpp	Wed Sep 01 13:56:21 2010 -0400
+++ b/ginebra2/ChromeWidget.cpp	Fri Sep 17 12:11:40 2010 -0400
@@ -45,7 +45,8 @@
 #include "GWebPage.h"
 #include "webpagecontroller.h"
 //#include "ViewStack.h"
-#include "BookmarksManager.h"
+#include "HistoryManager.h"
+#include "bookmarkscontroller.h"
 #include "ScriptObjects.h"
 #include "LocaleDelegate.h"
 #include "DeviceDelegate.h"
@@ -59,6 +60,10 @@
 #include "SystemNetworkImpl.h"
 #endif
 
+#ifdef QT_MOBILITY_SERVICE_FRAMEWORK
+#include "hsbookmarkpublishclient.h"
+#endif // QT_MOBILITY_SERVICE_FRAMEWORK
+
 #include "Downloads.h"
 
 #include "wrtbrowsercontainer.h"
@@ -328,11 +333,15 @@
     addJSObjectToPage(m_app, page);
     addJSObjectToPage(m_viewController, page);
     addJSObjectToPage(WebPageController::getSingleton(), page);
-    addJSObjectToPage(WRT::BookmarksManager::getSingleton(), page);
+    addJSObjectToPage(BookmarksController::getSingleton(), page);
+    addJSObjectToPage(WRT::HistoryManager::getSingleton(), page);
     addJSObjectToPage(ViewStack::getSingleton(), page);
     addJSObjectToPage(m_localeDelegate, page);
     addJSObjectToPage(m_deviceDelegate, page);
     addJSObjectToPage(m_networkDelegate, page);
+#ifdef QT_MOBILITY_SERVICE_FRAMEWORK
+    addJSObjectToPage(&(WRT::HsBookmarkPublishClientSingleton::Instance()), page);
+#endif // QT_MOBILITY_SERVICE_FRAMEWORK
     // Dynamically added objects
     //foreach(QObject * jsObj, m_jsObjects) {
     //  addJSObjectToPage(jsObj, page);