diff -r 50c53e893c3f -r 1221b68b8a5f wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp --- a/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp Thu Aug 19 10:12:10 2010 +0300 +++ b/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowsercontainer.cpp Tue Aug 31 15:29:38 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,49 +19,12 @@ // INCLUDE FILES #include #include -#include #include "wmdrmdlabrowserview.h" #include "wmdrmdlabrowsercontainer.h" // ======== MEMBER FUNCTIONS ======== // --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::ConstructL -// --------------------------------------------------------------------------- -// -void CWmDrmDlaBrowserContainer::ConstructL( - MBrCtlSpecialLoadObserver* aObserver ) - { - CreateWindowL(); - SetRect( iView->ClientRect() ); - - iBrCtlInterface = CreateBrowserControlL( - this, // parent control - iView->ClientRect(), // client rect - TBrCtlDefs::ECapabilityLoadHttpFw | - TBrCtlDefs::ECapabilityDisplayScrollBar | - TBrCtlDefs::ECapabilityUseDlMgr | - TBrCtlDefs::ECapabilityCursorNavigation, // Capabilities - TBrCtlDefs::ECommandIdBase, // command base - NULL, // Softkeys observer - NULL, // LinkResolver - aObserver, // Special load observer - NULL, // Layout Observer - NULL, // Dialog provider - NULL, // window observer - NULL // Download observer - ); - - iBrCtlInterface->SetBrowserSettingL( TBrCtlDefs::ESettingsAutoLoadImages, - ETrue ); - iBrCtlInterface->SetBrowserSettingL( TBrCtlDefs::ESettingsCookiesEnabled, - ETrue ); - iBrCtlInterface->SetBrowserSettingL( TBrCtlDefs::ESettingsEmbedded, - ETrue ); - ActivateL(); - } - -// --------------------------------------------------------------------------- // CWmDrmDlaBrowserContainer::CWmDrmDlaBrowserContainer // --------------------------------------------------------------------------- // @@ -71,84 +34,6 @@ } // --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::NewL -// --------------------------------------------------------------------------- -// -CWmDrmDlaBrowserContainer* CWmDrmDlaBrowserContainer::NewL( - CAknView* aView, - MBrCtlSpecialLoadObserver* aObserver ) - { - CWmDrmDlaBrowserContainer* self - = CWmDrmDlaBrowserContainer::NewLC( aView, aObserver ); - CleanupStack::Pop( self ); - return self; - } - - -// --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::NewLC -// --------------------------------------------------------------------------- -// -CWmDrmDlaBrowserContainer* CWmDrmDlaBrowserContainer::NewLC( - CAknView* aView, - MBrCtlSpecialLoadObserver* aObserver ) - { - CWmDrmDlaBrowserContainer* self - = new( ELeave ) CWmDrmDlaBrowserContainer( aView ); - CleanupStack::PushL( self ); - self->ConstructL( aObserver ); - return self; - } - - -// --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::~CWmDrmDlaBrowserContainer -// --------------------------------------------------------------------------- -// -CWmDrmDlaBrowserContainer::~CWmDrmDlaBrowserContainer() - { - if(iBrCtlInterface != NULL) - { - TRAP_IGNORE( iBrCtlInterface->HandleCommandL( (TInt)TBrCtlDefs::ECommandCancelFetch + (TInt)TBrCtlDefs::ECommandIdBase )); - } - delete iBrCtlInterface; - } - -// --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::BrCtlInterface -// --------------------------------------------------------------------------- -// -CBrCtlInterface* CWmDrmDlaBrowserContainer::BrCtlInterface() - { - return iBrCtlInterface; - } - -// --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::CountComponentControls -// --------------------------------------------------------------------------- -// -TInt CWmDrmDlaBrowserContainer::CountComponentControls() const - { - if ( iBrCtlInterface ) - { - return 1; - } - return 0; - } - -// --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::SizeChanged -// --------------------------------------------------------------------------- -// -void CWmDrmDlaBrowserContainer::SizeChanged() - { - if ( iBrCtlInterface ) - { - iBrCtlInterface->SetRect( Rect() ); - } - } - -// --------------------------------------------------------------------------- // CWmDrmDlaBrowserContainer::ComponentControl // --------------------------------------------------------------------------- // @@ -157,37 +42,18 @@ { switch ( aIndex ) { - case 0: - return iBrCtlInterface; - default: return NULL; } } // --------------------------------------------------------------------------- -// CWmDrmDlaBrowserContainer::OfferKeyEventL -// --------------------------------------------------------------------------- -// -TKeyResponse CWmDrmDlaBrowserContainer::OfferKeyEventL( - const TKeyEvent& aKeyEvent, - TEventCode aType ) - { - if ( iBrCtlInterface ) - { - return iBrCtlInterface->OfferKeyEventL( aKeyEvent, aType ); - } - return EKeyWasNotConsumed; - } - -// --------------------------------------------------------------------------- // CWmDrmDlaBrowserContainer::FocusChanged // --------------------------------------------------------------------------- // void CWmDrmDlaBrowserContainer::FocusChanged( TDrawNow aDrawNow ) { - iBrCtlInterface->SetFocus( IsFocused() ); CCoeControl::FocusChanged( aDrawNow ); } @@ -198,10 +64,6 @@ void CWmDrmDlaBrowserContainer::HandleResourceChange( TInt aType ) { - if ( iBrCtlInterface ) - { - iBrCtlInterface->HandleResourceChange( aType ); - } CCoeControl::HandleResourceChange( aType ); if ( aType == KEikDynamicLayoutVariantSwitch ) {