Changeset 23856

Timestamp:

06/28/07 11:48:23 (3 years ago)

Author:

spadma

Message:

2007-06-27 Prashanth Narayanaswamy < prashanth.narayanaswamy@nokia.com>

Reviewed by Sachin Padma.
DESC: SKWK-745NC7 - On going download files from Browser can be seen in Music Shop

• WebKit\ResourceLoader\inc\LoaderContainer.h: (CLoaderContainer::SetDownloadAppClientUID): new function for storing App UID in LoaderContainer (CLoaderContainer::DownloadAppClientUID): new function for retrieving App UID from LoaderContainer (CLoaderContainer::iDownloadClientAppUID): TUid instance for storing App Uid

• WebKit\ResourceLoader\src\LoaderContainer.cpp: (CLoaderContainer::ConstructL): initialized iDownloadClientAppUID with default browser Uid - KCRUidBrowser

• WebKit\ResourceLoader\src\HttpDownloadObserver.cpp: (CHttpDownloadObserver::InitDownloadMgrL): while connecting to download manager server, use the application Uid which is passed by the client, instead of always using Browser's App Uid

• WebKit\BrowserView\src\WebKitControl.cpp (CWebKitControl::SetBrowserSettingL): Store the Application Uid in LoaderContainer

Location:

S60/trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/WebCoreLoaderContainer.h (modified) (1 diff)
• WebKit/BrowserView/src/WebKitControl.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/ResourceLoader/inc/LoaderContainer.h (modified) (2 diffs)
• WebKit/ResourceLoader/src/HttpDownloadObserver.cpp (modified) (1 diff)
• WebKit/ResourceLoader/src/LoaderContainer.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+
+2007-06-27  Prashanth Narayanaswamy  <prashanth.narayanaswamy@nokia.com>
+        Reviewed by Sachin Padma.
+        DESC: SKWK-745NC7 - On going download files from Browser can be seen in Music Shop
+
+        * WebCore\bridge\WebCoreLoaderContainer.h:
+        (MWebCoreLoaderContainer::SetDownloadAppClientUID): new pure virtual function for storing App Uid in LoaderContainer
+        (MWebCoreLoaderContainer::DownloadAppClientUID): new pure virtual function for retrieving App Uid from LoaderContainer
+
 spadma, reviewed by zalan
  DESC: Fix build bustage

S60/trunk/WebCore/bridge/WebCoreLoaderContainer.h

@@ -79 +79 @@
     virtual CHttpCacheManager* CacheManagerL() = 0;
     virtual void UpdateCacheL( TDesC& aUrl, TDesC& aExpireDate ) = 0;
+    virtual void SetDownloadAppClientUID( TInt aAppUID ) = 0;
+    virtual TUid DownloadAppClientUID() = 0;
 };
 

S60/trunk/WebKit/BrowserView/src/WebKitControl.cpp

@@ -789 +789 @@
                     }
                 }
+                
+            if(aSetting == TBrCtlDefs::ESettingsLaunchAppUid)
+                {
+                MWebCoreLoaderContainer* loaderContainer = TWebCoreLoaderContainer::LoaderContainer();
+                loaderContainer->SetDownloadAppClientUID(val);
+                }
             break;
             }

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-06-27  Prashanth Narayanaswamy  <prashanth.narayanaswamy@nokia.com>
+
+        Reviewed by Sachin Padma.
+        DESC: SKWK-745NC7 - On going download files from Browser can be seen in Music Shop
+
+        * WebKit\ResourceLoader\inc\LoaderContainer.h:
+        (CLoaderContainer::SetDownloadAppClientUID): new function for storing App UID in LoaderContainer
+        (CLoaderContainer::DownloadAppClientUID): new function for retrieving App UID from LoaderContainer
+        (CLoaderContainer::iDownloadClientAppUID): TUid instance for storing App Uid
+
+        * WebKit\ResourceLoader\src\LoaderContainer.cpp:
+        (CLoaderContainer::ConstructL): initialized iDownloadClientAppUID with default browser Uid - KCRUidBrowser
+
+        * WebKit\ResourceLoader\src\HttpDownloadObserver.cpp:
+        (CHttpDownloadObserver::InitDownloadMgrL): while connecting to download manager server, use the application Uid which is passed by the client, 
+        instead of always using Browser's App Uid
+
+        * WebKit\BrowserView\src\WebKitControl.cpp
+        (CWebKitControl::SetBrowserSettingL): Store the Application Uid in LoaderContainer
+
 rathnasa, reviewed by <zbujtas@gmail.com>
  DESC: Widget Menu API needs refinement

S60/trunk/WebKit/ResourceLoader/inc/LoaderContainer.h

@@ -188 +188 @@
         */
         void SetClientAcceptHeadersL( const TPtrC& aAcceptHeaders );
+        
+        /**
+        * Set Download Client App UID
+        * @since 3.2
+        * @return
+        */
+        void SetDownloadAppClientUID( TInt aAppUID ) { iDownloadClientAppUID.iUid = aAppUID; }
+
+        /**
+        * Get Download Client App UID
+        * @since 3.2
+        * @return
+        */
+        TUid DownloadAppClientUID() { return iDownloadClientAppUID; }
 
         /**
@@ -312 +326 @@
         //
         TInt            iSessionRefCount;
+        
+        //
+        TUid            iDownloadClientAppUID;
+        
         //
         RHTTPSession    iHttpSession;

S60/trunk/WebKit/ResourceLoader/src/HttpDownloadObserver.cpp

@@ -218 +218 @@
     TBool master( !TWebCoreLoaderContainer::LoaderContainer()->BrowserEmbedded() );
 
-    iDownloadMgr.ConnectL( KCRUidBrowser, *this, master );
+    MWebCoreLoaderContainer* loaderContainer = TWebCoreLoaderContainer::LoaderContainer();
+    TUid DownloadAppUid = loaderContainer->DownloadAppClientUID();
+    
+    iDownloadMgr.ConnectL( DownloadAppUid, *this, master );
 
     if( !master )

S60/trunk/WebKit/ResourceLoader/src/LoaderContainer.cpp

@@ -44 +44 @@
 #include <HttpFilterCommonStringsExt.h>
 #include <HttpFilterCommonStringsAddition.h>
+#include <BrowserUiSDKCRKeys.h>
 #include "HttpLoaderEventToUiListener.h"
 #include "LoaderContainer.h"
@@ -100 +101 @@
     {
     iCache = CHttpCacheManager::NewL();
+    iDownloadClientAppUID = KCRUidBrowser;
     }