ginebra2/ChromeWidget.cpp
changeset 15 73c48011b8c7
parent 10 232fbd5a2dcb
equal deleted inserted replaced
13:491a1d15372f 15:73c48011b8c7
    43 //#include "CollapsingWidget.h"
    43 //#include "CollapsingWidget.h"
    44 #include "SlidingWidget.h"
    44 #include "SlidingWidget.h"
    45 #include "GWebPage.h"
    45 #include "GWebPage.h"
    46 #include "webpagecontroller.h"
    46 #include "webpagecontroller.h"
    47 //#include "ViewStack.h"
    47 //#include "ViewStack.h"
    48 #include "BookmarksManager.h"
    48 #include "HistoryManager.h"
       
    49 #include "bookmarkscontroller.h"
    49 #include "ScriptObjects.h"
    50 #include "ScriptObjects.h"
    50 #include "LocaleDelegate.h"
    51 #include "LocaleDelegate.h"
    51 #include "DeviceDelegate.h"
    52 #include "DeviceDelegate.h"
    52 #include "NetworkDelegate.h"
    53 #include "NetworkDelegate.h"
    53 #include "ObjectCharm.h"
    54 #include "ObjectCharm.h"
    56 #include "PopupWebChromeItem.h"
    57 #include "PopupWebChromeItem.h"
    57 #ifdef QT_MOBILITY_SYSINFO
    58 #ifdef QT_MOBILITY_SYSINFO
    58 #include "SystemDeviceImpl.h"
    59 #include "SystemDeviceImpl.h"
    59 #include "SystemNetworkImpl.h"
    60 #include "SystemNetworkImpl.h"
    60 #endif
    61 #endif
       
    62 
       
    63 #ifdef QT_MOBILITY_SERVICE_FRAMEWORK
       
    64 #include "hsbookmarkpublishclient.h"
       
    65 #endif // QT_MOBILITY_SERVICE_FRAMEWORK
    61 
    66 
    62 #include "Downloads.h"
    67 #include "Downloads.h"
    63 
    68 
    64 #include "wrtbrowsercontainer.h"
    69 #include "wrtbrowsercontainer.h"
    65 #include "webpagecontroller.h"
    70 #include "webpagecontroller.h"
   326     addJSObjectToPage(m_jsObject, page);
   331     addJSObjectToPage(m_jsObject, page);
   327     addJSObjectToPage(m_snippets, page);
   332     addJSObjectToPage(m_snippets, page);
   328     addJSObjectToPage(m_app, page);
   333     addJSObjectToPage(m_app, page);
   329     addJSObjectToPage(m_viewController, page);
   334     addJSObjectToPage(m_viewController, page);
   330     addJSObjectToPage(WebPageController::getSingleton(), page);
   335     addJSObjectToPage(WebPageController::getSingleton(), page);
   331     addJSObjectToPage(WRT::BookmarksManager::getSingleton(), page);
   336     addJSObjectToPage(BookmarksController::getSingleton(), page);
       
   337     addJSObjectToPage(WRT::HistoryManager::getSingleton(), page);
   332     addJSObjectToPage(ViewStack::getSingleton(), page);
   338     addJSObjectToPage(ViewStack::getSingleton(), page);
   333     addJSObjectToPage(m_localeDelegate, page);
   339     addJSObjectToPage(m_localeDelegate, page);
   334     addJSObjectToPage(m_deviceDelegate, page);
   340     addJSObjectToPage(m_deviceDelegate, page);
   335     addJSObjectToPage(m_networkDelegate, page);
   341     addJSObjectToPage(m_networkDelegate, page);
       
   342 #ifdef QT_MOBILITY_SERVICE_FRAMEWORK
       
   343     addJSObjectToPage(&(WRT::HsBookmarkPublishClientSingleton::Instance()), page);
       
   344 #endif // QT_MOBILITY_SERVICE_FRAMEWORK
   336     // Dynamically added objects
   345     // Dynamically added objects
   337     //foreach(QObject * jsObj, m_jsObjects) {
   346     //foreach(QObject * jsObj, m_jsObjects) {
   338     //  addJSObjectToPage(jsObj, page);
   347     //  addJSObjectToPage(jsObj, page);
   339     // }
   348     // }
   340     addJSObjectToPage(m_downloads, page);
   349     addJSObjectToPage(m_downloads, page);