diff -r 491a1d15372f -r 73c48011b8c7 browsercore/appfw/Api/Managers/Managers.pri
--- a/browsercore/appfw/Api/Managers/Managers.pri	Fri Sep 17 08:27:10 2010 +0300
+++ b/browsercore/appfw/Api/Managers/Managers.pri	Mon Oct 04 00:04:54 2010 +0300
@@ -1,32 +1,24 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
-#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, version 2.1 of the License.
-# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
-#
 # You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, 
+# along with this program.  If not,
 # see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
-#
 # Description:
-#
-
-HEADERS += \
-    $$PWD/BookmarksManager_p.h \
-    $$PWD/BookmarksManager.h \
+HEADERS += $$PWD/HistoryManager.h \
+    $$PWD/HistoryManager_p.h \
     $$PWD/secureuicontroller_p.h \
     $$PWD/secureuicontroller.h \
     $$PWD/LoadController.h \
     $$PWD/viewcontroller.h \
     $$PWD/webpagecontroller.h \
-    $$PWD/webpagecontroller_p.h  \
+    $$PWD/webpagecontroller_p.h \
     $$PWD/downloadcontroller_p.h \
     $$PWD/downloadcontroller.h \
     $$PWD/downloadproxy_p.h \
@@ -35,9 +27,7 @@
     $$PWD/contentagent.h \
     $$PWD/lowmemoryhandler.h \
     $$PWD/lowmemoryhandler_p.h
-
-SOURCES += \
-    $$PWD/BookmarksManager.cpp \
+SOURCES += $$PWD/HistoryManager.cpp \
     $$PWD/secureuicontroller.cpp \
     $$PWD/LoadController.cpp \
     $$PWD/viewcontroller.cpp \
@@ -47,12 +37,13 @@
     $$PWD/downloadproxydata.cpp \
     $$PWD/contentagent.cpp \
     $$PWD/lowmemoryhandler.cpp
- 
-symbian: { 
-SOURCES += \
-   $$PWD/lowmemoryhandler_p_s60.cpp
+HEADERS += $$PWD/bookmarkscontroller.h
+SOURCES += $$PWD/bookmarkscontroller.cpp
+contains(br_mobility_serviceframework, yes) { 
+    HEADERS += $$PWD/hsbookmarkpublishclient.h
+    SOURCES += $$PWD/hsbookmarkpublishclient.cpp
 }
-!symbian: {
-SOURCES += \
-   $$PWD/lowmemoryhandler_p.cpp
-}
+symbian::SOURCES += $$PWD/lowmemoryhandler_p_s60.cpp
+!symbian::SOURCES += $$PWD/lowmemoryhandler_p.cpp
+INCLUDEPATH += $$PWD/../../../../../../mw/browser/bookmarks
+QT += sql