--- a/hotspotfw/group/bld.inf	Wed Jun 23 19:25:42 2010 +0300
+++ b/hotspotfw/group/bld.inf	Tue Jul 06 15:29:22 2010 +0300
@@ -23,13 +23,9 @@
 
 PRJ_EXPORTS
 ../rom/hotspot.iby                      CORE_MW_LAYER_IBY_EXPORT_PATH(hotspot.iby)
-../rom/hotspotResources.iby             LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(hotspotResources.iby)
 ../rom/hotspotfwstub.sis               /epoc32/data/z/system/install/hotspotfwstub.sis
 ../rom/ictsstub.sis                    /epoc32/data/z/system/install/ictsstub.sis
 
-// Localisation files of whole Hotspot localised here
-../hsbrowser/loc/hsbrowser.loc          MW_LAYER_LOC_EXPORT_PATH(hsbrowser.loc)
-
 ../internetconnectivitytestservice/conf/icts.confml		MW_LAYER_CONFML(icts.confml)
 ../internetconnectivitytestservice/conf/icts_10282EC7.crml	MW_LAYER_CRML(icts_10282ec7.crml)
 ../internetconnectivitytestservice/group/backup_registration.xml	/epoc32/data/z/private/10282ec5/backup_registration.xml
@@ -56,11 +52,5 @@
 ../hsclient/group/NetCfgExtnHotSpot.mmp
 ../hsclient/group/hssmgmtimpl.mmp
 ../hspluginforagent/group/wlanagthotspotimpl.mmp
-../hsbrowser/group/hsbrowser.mmp
 ../hsserver/group/hssscanlist.mmp
 PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE hsbrowsericon_aif.mif
-OPTION SOURCES -c8,1 qgn_menu_wlan_logon
-END

--- a/hotspotfw/hsbrowser/data/hsbrowser.rss	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   This file contains all the resources for HsBrowser.
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    HSBR // 4 letter ID
-
-//  INCLUDES
-
-#include <eikon.rh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.loc>
-#include <appinfo.rh>
-#include <avkon.mbg>
-#include <data_caging_paths_strings.hrh>
-#include <hsbrowser.loc>
-
-//  RESOURCE DEFINITIONS 
-
-// -----------------------------------------------------------------------------
-//
-//    Define the resource file signature
-//    This resource should be empty.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-// -----------------------------------------------------------------------------
-//
-// Default Document Name
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF { buf=""; }
-
-// -----------------------------------------------------------------------------
-//
-// Define default CBA key and status pane.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE EIK_APP_INFO
-    {
-    cba = R_AVKON_SOFTKEYS_CANCEL;
-    status_pane = r_hsbrowser_app_model;
-    }
-
-// ---------------------------------------------------------
-//   
-//  r_hsbrowser_app_model
-//  Define status pane of HsBrowser.
-//
-// ---------------------------------------------------------
-//
-RESOURCE STATUS_PANE_APP_MODEL r_hsbrowser_app_model
-     {
-     layout = R_AVKON_STATUS_PANE_LAYOUT_SMALL_WITH_SIGNAL_PANE;
-     panes =
-        {
-        SPANE_PANE
-            {
-            id = EEikStatusPaneUidNavi;
-            type = EAknCtNaviPane;
-            resource = r_hsbrowser_navi_decorator;
-            }
-        };
-     }
-
-// ---------------------------------------------------------
-//   
-//  r_hsbrowser_navi_decorator
-//  Define static title of HsBrowser.
-//
-// ---------------------------------------------------------
-//
-RESOURCE NAVI_DECORATOR r_hsbrowser_navi_decorator
-    {
-    type = ENaviDecoratorLabel;
-    control = NAVI_LABEL
-        {
-        txt = qtn_netw_conset_wba_static_title;
-        };
-    }
-
-// ----------------------------------------------------------------------------
-//
-// r_hsbrowser_localisable_app_info
-//
-// ----------------------------------------------------------------------------
-//
-RESOURCE LOCALISABLE_APP_INFO r_hsbrowser_localisable_app_info
-    {
-    short_caption = qtn_netw_conset_wba_static_title;
-    caption_and_icon = 
-        CAPTION_AND_ICON_INFO
-            {
-            caption = qtn_netw_conset_wba_static_title;
-            icon_file = "Z:"APP_BITMAP_DIR"\\hsbrowsericon_aif.mif";
-            };
-    }
-
-// ----------------------------------------------------------------------------
-//
-// r_hsbrowser_softkeys_continue_cancel
-//
-// ----------------------------------------------------------------------------
-//
-RESOURCE CBA r_hsbrowser_softkeys_continue_cancel
-    {
-    buttons =
-        {
-        CBA_BUTTON{ id = EAknSoftkeyNext; txt = text_softkey_continue; },
-        CBA_BUTTON{ id = EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        CBA_BUTTON{ id = EAknSoftkeyNext; txt = text_softkey_continue; }
-        };
-    }
-
-RESOURCE CBA r_hsbrowser_softkeys_cancel
-    {
-    buttons =
-        {
-        CBA_BUTTON{ txt = text_softkey_empty; },
-        CBA_BUTTON{ id = EAknSoftkeyClose; txt = text_softkey_cancel; },
-        CBA_BUTTON{ txt = text_softkey_empty; }
-        };
-    }
-    
-// ----------------------------------------------------------------------------
-//
-// r_hsbrowser_softkeys_continue_exit
-//
-// ----------------------------------------------------------------------------
-//
-RESOURCE CBA r_hsbrowser_softkeys_continue_exit
-    {
-    buttons =
-        {
-        CBA_BUTTON{ id = EAknSoftkeyNext; txt = text_softkey_continue; },
-        CBA_BUTTON{ id = EAknSoftkeyExit; txt = text_softkey_exit; },
-        CBA_BUTTON{ id = EAknSoftkeyNext; txt = text_softkey_continue; }
-        };
-    }  
-
-// ----------------------------------------------------------------------------
-//
-// r_qtn_netw_conset_wba_info_complete
-//
-// ----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_qtn_netw_conset_wba_info_complete
-    {
-    buf = qtn_netw_conset_wba_info_complete;
-    }
-
-// ----------------------------------------------------------------------------
-//
-// r_qtn_netw_conset_wba_info_closed
-//
-// ----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_qtn_netw_conset_wba_info_closed
-    {
-    buf = qtn_netw_conset_wba_info_closed;
-    }
-
-RESOURCE TBUF r_qtn_netw_conset_wba_static_title
-    {
-    buf = qtn_netw_conset_wba_static_title;
-    }
-// End of File

--- a/hotspotfw/hsbrowser/data/hsbrowser_reg.rss	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   RSS for registration file for HsBrowser.
-*
-*/
-
-
-
-#include <appinfo.rh>
-#include <hsbrowser.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x2000AFCC 
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "HsBrowser";
-    localisable_resource_file = "\\resource\\apps\\hsbrowser";
-    localisable_resource_id = R_HSBROWSER_LOCALISABLE_APP_INFO;
-    hidden = KAppIsHidden;
-    embeddability = KAppNotEmbeddable;
-    newfile = KAppDoesNotSupportNewFile;
-    }
-
-// End of File

--- a/hotspotfw/hsbrowser/group/bld.inf	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:    This file provides the information required
-*                for building the whole of a Hotspot Browser Application.
-*
-*/
-
-
-
-
-PRJ_PLATFORMS
-
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-hsbrowser.mmp

--- a/hotspotfw/hsbrowser/group/hsbrowser.mmp	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:     This is the project specification file for
-*                HotSpot Browser Application.
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET HsBrowser.exe
-TARGETTYPE exe
-UID 0x100039CE 0x2000AFCC
-VENDORID VID_DEFAULT
-CAPABILITY	CAP_APPLICATION NetworkControl
-
-EPOCSTACKSIZE   0x10000
-EPOCHEAPSIZE 0x2000 0x500000 
-
-SOURCEPATH ../src
-SOURCE  hsbrowserapp.cpp
-SOURCE  hsbrowserappui.cpp
-SOURCE  hsbrowserdocument.cpp
-SOURCE  hsbrowsermodel.cpp
-SOURCE  hsbrowsercontainer.cpp
-SOURCE  hsbrowserloadeventobserver.cpp
-SOURCE  hsbrowserspecialloadobserver.cpp
-SOURCE  hsbrowserictsobserver.cpp
-SOURCE  hsbrowserhssrvnotifs.cpp
-
-// UI resource file
-START RESOURCE ../data/hsbrowser.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-// registration file
-START RESOURCE ../data/hsbrowser_reg.rss
-DEPENDS hsbrowser.rsg
-TARGETPATH 	  /private/10003a3f/apps
-END
-
-USERINCLUDE .
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib apparc.lib cone.lib eikcore.lib
-LIBRARY avkon.lib apmime.lib apgrfx.lib efsrv.lib eikcoctl.lib commonui.lib ecom.lib
-LIBRARY eikdlg.lib gdi.lib bitgdi.lib esock.lib insock.lib
-LIBRARY hotspotclient.lib
-LIBRARY ictsclientinterface.lib
-LIBRARY ws32.lib
-LIBRARY commonengine.lib
-LIBRARY browserengine.lib
-LIBRARY aknnotify.lib eiksrv.lib
-LIBRARY akncapserverclient.lib
-LIBRARY bafl.lib
-LIBRARY hlplch.lib      // for "Help" options menu

--- a/hotspotfw/hsbrowser/inc/am_debug.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Debug utilities
-*
-*/
-
-
-
-#ifndef AM_DEBUG_H
-#define AM_DEBUG_H
-
-#include <e32svr.h>
-
-#ifdef _DEBUG
-
-/**
-* Class for producing debug traces
-* @lib
-* @since Series 60 3.0
-*/
-class Debug
-    {
-    public:
-        static inline void PrintBuffer( TUint aLength, const TUint8* aData );
-        static inline void PrintString( const TDesC& aString, TUint aLength, const TUint8* aData );
-        static inline void PrintTimestamp( const TDesC& aString );
-    };
-
-#define DEBUG(a)		            RDebug::Print(_L(a))
-#define DEBUG1(a,b)		            RDebug::Print(_L(a),b)
-#define DEBUG2(a,b,c)	            RDebug::Print(_L(a),b,c)
-#define DEBUG3(a,b,c,d)	            RDebug::Print(_L(a),b,c,d)
-#define DEBUG4(a,b,c,d,e)	        RDebug::Print(_L(a),b,c,d,e)
-#define DEBUG5(a,b,c,d,e,f)	        RDebug::Print(_L(a),b,c,d,e,f)
-#define DEBUG6(a,b,c,d,e,f,g)	    RDebug::Print(_L(a),b,c,d,e,f,g)
-#define DEBUG7(a,b,c,d,e,f,g,h) 	RDebug::Print(_L(a),b,c,d,e,f,g,h)
-#define DEBUG8(a,b,c,d,e,f,g,h,i)	RDebug::Print(_L(a),b,c,d,e,f,g,h,i)
-#define DEBUG_MAC(a)	            RDebug::Print(_L("%02X%02X%02X%02X%02X%02X"),a[0],a[1],a[2],a[3],a[4],a[5])
-#define DEBUG_RATES(a)	            RDebug::Print(_L("%d %d %d %d %d %d %d %d"),a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7])
-#define DEBUG_BUFFER(a,b)           Debug::PrintBuffer(a,b);
-#define DEBUG1S(a,b,c)		        Debug::PrintString(_L(a),b,c);
-#define DEBUGT(a)                   Debug::PrintTimestamp(_L(a));
-
-#include "am_debug.inl"
-
-#else // _DEBUG
-
-#define DEBUG(a)                    /* _DEBUG is not defined. */
-#define DEBUG1(a,b)                 /* _DEBUG is not defined. */
-#define DEBUG2(a,b,c)               /* _DEBUG is not defined. */
-#define DEBUG3(a,b,c,d)             /* _DEBUG is not defined. */
-#define DEBUG4(a,b,c,d,e)           /* _DEBUG is not defined. */
-#define DEBUG5(a,b,c,d,e,f)	        /* _DEBUG is not defined. */
-#define DEBUG6(a,b,c,d,e,f,g)       /* _DEBUG is not defined. */
-#define DEBUG7(a,b,c,d,e,f,g,h)     /* _DEBUG is not defined. */
-#define DEBUG8(a,b,c,d,e,f,g,h,i)	/* _DEBUG is not defined. */
-#define DEBUG_MAC(a)                /* _DEBUG is not defined. */
-#define DEBUG_RATES(a)              /* _DEBUG is not defined. */
-#define DEBUG_BUFFER(a,b)           /* _DEBUG is not defined. */
-#define DEBUG1S(a,b,c)		        /* _DEBUG is not defined. */
-#define DEBUGT(a)                   /* _DEBUG is not defined. */
-
-#endif // _DEBUG
-
-#endif // AM_DEBUG_H

--- a/hotspotfw/hsbrowser/inc/am_debug.inl	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Debug utilities
-*
-*/
-
-
-
-const TUint KPrintLineLength = 200;
-const TUint KPrintHexPerLine = 8;
-
-// -----------------------------------------------------------------------------
-// Debug::PrintBuffer
-// -----------------------------------------------------------------------------
-//
-inline void Debug::PrintBuffer( TUint aLength, const TUint8* aData )
-    {
-    TBuf<KPrintLineLength> line;
-    TUint idx( 0 );
-    for ( ; idx < aLength; ++idx )
-        {
-        if ( idx && !( idx % KPrintHexPerLine ) )
-            {
-            RDebug::Print( line );
-            line.Zero();
-            }
-        line.AppendFormat( _L( "%02X " ), aData[idx] );
-        }
-    RDebug::Print( line );
-    }
-
-// -----------------------------------------------------------------------------
-// Debug::PrintString
-// -----------------------------------------------------------------------------
-//
-inline void Debug::PrintString( const TDesC& aString, TUint aLength, const TUint8* aData )
-    {
-    TBuf<KPrintLineLength> line;
-
-    line.Append( aString );
-    
-    TPtrC8 buf8( aData, aLength );
-    
-    TBuf<KPrintLineLength> buf16;
-    buf16.Copy( buf8 );
-
-    line.Append( buf16 );
-    
-    RDebug::Print( line );
-    }
-
-// -----------------------------------------------------------------------------
-// Debug::PrintTimestamp
-// -----------------------------------------------------------------------------
-//
-inline void Debug::PrintTimestamp( const TDesC& aString )
-    {
-    TBuf<KPrintLineLength> line;
-    TTime time;
-    time.HomeTime();
-    
-    time.FormatL( line, _L( "%H:%T:%S:%C" ) );
-    line.Append( _L( " " ) );
-    line.Append( aString );
-    
-    RDebug::Print( line );
-    }

--- a/hotspotfw/hsbrowser/inc/hsbrowserapp.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Declares main application class.
-*
-*/
-
-
-
-#ifndef HSBROWSERAPP_H
-#define HSBROWSERAPP_H
-
-// INCLUDES
-#include <aknapp.h>
-
-// CLASS DECLARATION
-/**
-* CHsBrowserApp application class.
-* Provides the factory to create a concrete document object.
-* 
-*/
-class CHsBrowserApp : public CAknApplication
-    {
-    
-    public: // Functions from base classes
-        /**
-        * From CApaApplication, overridden to enable INI file support.
-        * @return CDictionaryStore*, A pointer to the dictionary store
-        */
-        CDictionaryStore* OpenIniFileLC(RFs& aFs) const;
-    private:
-
-        /**
-        * From CApaApplication, creates CHsBrowserDocument document object.
-        * @return CApaDocument*, A pointer to the created document object.
-        */
-        CApaDocument* CreateDocumentL();
-        
-        /**
-        * From CApaApplication, returns application's UID.
-        * @return TUid, The value of KUidHsBrowserApp.
-        */
-        TUid AppDllUid() const;
-    };
-
-#endif
-
-// End of File
-

--- a/hotspotfw/hsbrowser/inc/hsbrowserappui.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   The UI class for HotSpot Browser Application.
-*
-*/
-
-
-
-#ifndef HSBROWSERAPPUI_H
-#define HSBROWSERAPPUI_H
-
-// INCLUDES
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-#include <in_sock.h>
-
-// FORWARD DECLARATIONS
-class CHsBrowserContainer;
-
-// CONSTANTS
-const TInt KBufSize = 512;
-
-// CLASS DECLARATION
-/**
-* CHsBrowserAppUi class.
-* Application UI class which provides support for the following features:
-* - EIKON control architecture
-* 
-*/
-class CHsBrowserAppUi : public CAknAppUi
-    {
-    public:
-    
-        /**
-        * EPOC default constructor.
-        */      
-        void ConstructL();
-
-        /**
-        * Destructor.
-        */      
-        ~CHsBrowserAppUi();
-        
-    public: // From CEikAppUi
-        
-        /**
-        * Parses command line arguments.
-        *
-        * @param aCommandLine Reference to command line.
-        */
-        TBool ProcessCommandParametersL( CApaCommandLine& aCommandLine );
-
-        /**
-        * Takes care of command handling.
-        *
-        * @param aCommand Command to be handled
-        */
-        void HandleCommandL(TInt aCommand);
-
-        /**
-        * Handles key events.
-        *
-        * @param aKeyEvent Event to handled.
-        * @param aType Type of the key event. 
-        * @return Response code (EKeyWasConsumed, EKeyWasNotConsumed). 
-        */
-        virtual TKeyResponse HandleKeyEventL(
-            const TKeyEvent& aKeyEvent,TEventCode aType);
-
-        /**
-        * Handles changes in keyboard focus when an application switches to, 
-        * or from, the foreground.
-        *
-        * @param aForeground ETrue if the application is in the foreground,
-        * otherwise EFalse.
-        */
-        void HandleForegroundEventL( TBool aForeground );
-
-    private: //data
-
-        /**
-        * Pointer to container of Hotspot Browser .
-        */
-        CHsBrowserContainer* iAppContainer;        
-    };
-
-#endif
-
-// End of File
-
-

--- a/hotspotfw/hsbrowser/inc/hsbrowsercommon.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Common data for HotSpot Browser Application.
-*
-*/
-
-
-
-#ifndef HSBROWSERCOMMON_H
-#define HSBROWSERCOMMON_H
-
-// CONSTANTS
-
-/**
-* Z drive.
-*/
-_LIT( KDriveZ, "z:" );
-
-/**
-* C drive.
-*/
-_LIT( KDriveC, "c:" );
-
-/*
-* Series60v3.2 product file.
-*/
-_LIT( KS60ProductIdFile, "Series60v3.2.sis" );
-
-/*
-* ROM install directory.
-*/
-_LIT( KROMInstallDir, "z:\\system\\install\\" );
-
-/**
-* Resource file for Hotspot Browser.
-*/
-_LIT( KResourceFile, "hsbrowser.rsc" );
-
-/**
-* UID3 of the application.
-*/
-const TUid KUidHsBrowserApp = { 0x2000AFCC };
-
-#endif
-
-// End of File

--- a/hotspotfw/hsbrowser/inc/hsbrowsercontainer.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,333 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Declares container control for HotSpot Browser Application.
-*
-*/
-
-
-
-#ifndef HSBROWSERCONTAINER_H
-#define HSBROWSERCONTAINER_H
-
-// INCLUDES
-#include <coecntrl.h>
-#include <coecobs.h>
-#include <ictscommon.h>
-#include <ictsclientinterface.h>
-#include <eikmenup.h>
-#include <brctlinterface.h>
-#include <wlanmgmtcommon.h>
-#include <wlanmgmtclient.h>
-
-// FORWARD DECLARATIONS
-class CBrCtlInterface;
-class CHsBrowserSpecialLoadObserver;
-class CHsBrowserLoadEventObserver;
-class CHsBrowserIctsObserver;
-class CHsBrowserHsSrvNotifs;
-class CHsBrowserModel;
-class TCoeEvent;
-class CAknNavigationControlContainer;
-class CAknNavigationDecorator;
-class CAknIndicatorContainer;
-class CAknNaviLabel;       
-
-// CONSTANTS
-const TInt KComponentsNumber = 1;
-const TInt KBrCtlComponentIndex = 0;
-
-// CLASS DECLARATION
-/**
-*  CHsBrowserContainer class.
-*  This is the container control class.
-*/
-class CHsBrowserContainer : public CCoeControl
-    {
-    public: // Constructors and destructor
-        
-        /**
-        * C++ default constructor.
-        *
-        * @param aModel Pointer to model of HsBrowser.
-        */
-        CHsBrowserContainer( CHsBrowserModel* aModel );
-        
-        /**
-        * EPOC default constructor.
-        *
-        * @param aRect Frame rectangle for container.
-        */
-        void ConstructL( const TRect& aRect );
-
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserContainer();
-
-    public:
-            enum TNaviPaneEvent
-            {
-            ELoadingLoginPage,
-            ELoadingUrl,
-            EPageTitleAvailable,
-            ELoadingFinished
-            };
-
-
-    public: // new
-
-        /**
-        * Initializes the indicators in the navi pane.
-        */   
-        void InitNaviPaneL();
-
-        /**
-        * Updates the indicators in the navi pane.
-        */      
-        void UpdateNaviPane( TNaviPaneEvent aUpdateEvent );
-
-        /**
-        * Pass a command to the Browser Control
-        *
-        * @param aCommand The command that the Browser Control should process.
-        */
-        void HandleCommandL( TInt aCommand );        
-
-        /**
-        * Handles key events
-        *
-        * @param aKeyEvent The key event that occurred.
-        * @param aType The window server event type that is being handled
-        * @return TKeyResponse Value indicates whether or not the key event was consumed by the control.
-        *                      The default implementation simply returns EKeyWasNotConsumed.
-        */
-        TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        
-        /**
-        * Handle events when when an application switches to, 
-        * or from, the foreground.
-        *
-        * @param aForeground ETrue if the application is in the foreground,
-        * otherwise EFalse.
-        */
-        void ProcessForegroundEvent( TBool aForeground );
-        
-        /**
-        * Send application to foreground.
-        */
-        void SendToForeground();
-        
-        /**
-        * Restore original ordinary position and priority.
-        */
-        void RestorePositionAndPriority();
-
-        /**
-        * Send application to background.
-        */        
-        void SendToBackground();
-        
-        /**
-        * Update softkeys according to model state. 
-        */
-        void UpdateSoftkeys();
-        
-        /**
-        * Show login complete information note.
-        */
-        void ShowLoginCompleteNote();
-        
-        /**
-        * Show connection closed information note.
-        */
-        void ShowConnClosedNote();
-        
-        /**
-        * Initialize model, attach to connection, and load specified URL.
-        *
-        * @param aUrl URL of authentication web page.
-        * @param aIapId ID of IAP.
-        * @param aNetId Network ID.
-        * @return KErrNone, if successful, otherwice one of system wide errorcodes.
-        */
-        TInt LoadRedirect( const TPtrC& aUrl, TInt aIapId, TInt aNetId );
-        
-        /**
-        * Called when wlan connection is lost.
-        * Shows information note and exits.
-        */
-        void ProcessWlanConnModeNotConnected();
-                
-        /**
-        * Returns boolean value for application foreground status.
-        *
-        * @return ETrue / EFalse
-        */
-        TBool IsForeground();
-        
-    public: // access
-
-        /**
-        * Accessor method for iBrCtlInterface
-        *
-        * @return CBrCtlInterface* A pointer to the browser control interface.
-        */
-		inline CBrCtlInterface* BrCtlInterface();
-
-        /**
-        * Accessor method for iHsBrowserSpecialLoadObserver.
-        *
-        * @return CHsBrowserSpecialLoadObserver* A pointer to the special load observer.
-        */
-		inline CHsBrowserSpecialLoadObserver* HsBrowserSpecialLoadObserver();
-        
-        /**
-        * Accessor method for iHsBrowserIctsObserver.
-        *
-        * @return CHsBrowserIctsObserver* A pointer to the Internet connectivity test observer.
-        */
-		inline CHsBrowserIctsObserver* HsBrowserIctsObserver();
-        
-        /**
-        * Accessor method for iModel.
-        *
-        * @return CHsBrowserModel* A pointer to the model of HsBrowser.
-        */
-        inline CHsBrowserModel* Model();        
-        
-        /**
-        * Accessor method for iNaviLabel.
-        *
-        * @return CAknNaviLabel* A pointer to the label control in the navigation pane.
-        */
-        inline CAknNaviLabel* NaviLabel();
-        
-        /**
-        * Get boolean value if input box is active or not.
-        *
-        * @return ETrue / EFalse
-        */
-        inline TBool ActiveInputBox();
-        
-        /**
-        * Set input box active flag
-        */
-        inline void SetActiveInputBox( TBool aActiveInputBox );
-        
-    private: // From CoeControl
-
-        /**
-        * From CoeControl,SizeChanged.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl,CountComponentControls.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CCoeControl,ComponentControl.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * From CCoeControl,Handle key events.
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType);
-    
-        /**
-        * From CCoeControl,Handle resource change events.
-        */
-        void HandleResourceChange( TInt aType );
-    
-    private: //data 
-    
-        /**
-        * Pointer to the browser control interface.
-        * Owned.
-        */
-        CBrCtlInterface* iBrCtlInterface;
-
-        /**
-        * Command Base
-        */
-        TInt iCommandBase;
-
-        /**
-        * Special Load Observer
-        */
-        CHsBrowserSpecialLoadObserver* iHsBrowserSpecialLoadObserver;
-        
-        /**
-        * Load Event Observer
-        */
-        CHsBrowserLoadEventObserver* iHsBrowserLoadEventObserver;
-
-        /**
-        * Internet connectivity test observer
-        */
-        CHsBrowserIctsObserver* iHsBrowserIctsObserver;
-        
-        /**
-        * Notifications from hotspot server.
-        */
-        CHsBrowserHsSrvNotifs* iHsBrowserHsSrvNotifs;
-        
-        /**
-        * Model of HsBrowser
-        */
-        CHsBrowserModel* iModel;
-        
-        /**
-        * Pointer to default control in the status pane's navigation pane.
-        * Not owned.
-        */
-        CAknNavigationControlContainer* iNaviPane;
-        
-        /**
-        * Pointer to the editor indicator control in the navigation pane.
-        * Owned.
-        */
-        CAknNavigationDecorator* iEditorIndicatorContainer;
-                
-        /**
-        * Pointer to the editor indicator control in the navigation pane
-        * Not owned.
-        */
-        CAknIndicatorContainer* iIndiContainer;
-        
-       /**
-        * Resource.
-        */
-        TInt iResource; 
-        
-        /**
-        * Flag for softkey press.
-        */
-        TBool iActiveInputBox;
-        
-        /**
-        * handle to WlanMgmtClient
-        */
-     	CWlanMgmtClient *iMgtClient;
-    };
-
-#include "hsbrowsercontainer.inl"
-
-#endif
-
-// End of File
-

--- a/hotspotfw/hsbrowser/inc/hsbrowsercontainer.inl	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Inline method definitions for CHsBrowserContainer.   
-*
-*/
-
-
-
-#ifndef HSBROWSERCONTAINER_INL
-#define HSBROWSERCONTAINER_INL
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::BrCtlInterface
-// ---------------------------------------------------------------------------
-//
-CBrCtlInterface* CHsBrowserContainer::BrCtlInterface()
-    {
-    return iBrCtlInterface;
-    }
-
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::HsBrowserSpecialLoadObserver
-// ---------------------------------------------------------------------------
-//
-CHsBrowserSpecialLoadObserver* CHsBrowserContainer::
-    HsBrowserSpecialLoadObserver()
-    {
-    return iHsBrowserSpecialLoadObserver;
-    }
-        
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::HsBrowserIctsObserver
-// ---------------------------------------------------------------------------
-//
-CHsBrowserIctsObserver* CHsBrowserContainer::HsBrowserIctsObserver()
-    {
-    return iHsBrowserIctsObserver;
-    }
-        
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::Model
-// ---------------------------------------------------------------------------
-//
-CHsBrowserModel* CHsBrowserContainer::Model()
-    {
-    return iModel;
-    }
-    
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::NaviLabel
-// ---------------------------------------------------------------------------
-//
-CAknNaviLabel* CHsBrowserContainer::NaviLabel()
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::ActiveInputBox
-// ---------------------------------------------------------------------------
-//
-TBool CHsBrowserContainer::ActiveInputBox()
-    {
-	return iActiveInputBox;
-    }
-
-// ---------------------------------------------------------------------------
-// CHsBrowserContainer::SetActiveInputBox
-// ---------------------------------------------------------------------------
-//
-void CHsBrowserContainer::SetActiveInputBox( TBool aActiveInputBox )
-    {
-	iActiveInputBox = aActiveInputBox;
-    }
-
-#endif

--- a/hotspotfw/hsbrowser/inc/hsbrowserdocument.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Declares document for application.
-*
-*/
-
-
-
-#ifndef HSBROWSERDOCUMENT_H
-#define HSBROWSERDOCUMENT_H
-
-// INCLUDES
-#include <AknDoc.h>
-   
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class  CEikAppUi;
-class CHsBrowserModel;
-
-// CLASS DECLARATION
-
-/**
-*  CHsBrowserDocument application class.
-*/
-class CHsBrowserDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-        /**
-        * Two-phased constructor.
-        */
-        static CHsBrowserDocument* NewL( CEikApplication& aApp );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CHsBrowserDocument();
-
-    public: // access
-    
-        /**
-        * Accessor method for iModel.
-        *
-        * @return CHsBrowserModel* A pointer to model of HsBrowser.
-        */
-        inline CHsBrowserModel* Model();
-    
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CHsBrowserDocument( CEikApplication& aApp );
-        
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-        
-    private: // new
-         
-        /**
-        * Initialize model.
-        */ 
-        //inline void ResetModel();
-         
-    private:
-
-        /**
-        * From CEikDocument, create CBrCtlSampleAppAppUi "App UI" object.
-        */
-        CEikAppUi* CreateAppUiL();
-    
-    private: // data
-    
-        /**
-        * Pointer to model of HsBrowser.
-        * Owned.
-        */
-        CHsBrowserModel* iModel;
-    };
-
-#include "hsbrowserdocument.inl"
-
-#endif
-
-// End of File
-

--- a/hotspotfw/hsbrowser/inc/hsbrowserdocument.inl	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Inline method definitions for CHsBrowserModel.
-*
-*/
-
-
-
-#ifndef HSBROWSERDOCUMENT_INL
-#define HSBROWSERDOCUMENT_INL
-
-#include "hsbrowsermodel.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CHsBrowserDocument::Model
-// ---------------------------------------------------------
-//
-CHsBrowserModel* CHsBrowserDocument::Model()
-    {
-    return iModel;	
-    }
-
-#endif

--- a/hotspotfw/hsbrowser/inc/hsbrowserhssrvnotifs.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Implements notifications interface from Hotspot server in order
-*                to receive wlan connection closed notification.
-*
-*/
-
-
-
-#ifndef HSBROWSERHSSRVNOTIFS_H
-#define HSBROWSERHSSRVNOTIFS_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <ictscommon.h>
-#include "hsssrvnotifications.h"
-#include <wlanmgmtcommon.h>
-#include <wlanmgmtinterface.h>
-
-// FORWARD DECLARATION
-class CHsBrowserContainer;
-
-// CLASS DECLARATION
-/**
-* CHsBrowserHsSrvNotifs class.
-* Class implements notifications interface for Hotspot server in order
-* to receive wlan connection closed notification.
-*/
-class CHsBrowserHsSrvNotifs : public CBase, public MWlanMgmtNotifications
-	{
-	
-	    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aContainer Pointer to container of browser application
-        */
-        static CHsBrowserHsSrvNotifs* NewL( CHsBrowserContainer* aContainer );
-
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserHsSrvNotifs();
-
-    public: // from MWlanMgmtNotifications
-    
-      	/**
-        * Connection state has changed .
-        */
-    	virtual void ConnectionStateChanged( TWlanConnectionMode aNewState );
-
-                        
-    private:
-    
-        /**
-        * C++ default constructor.
-        *
-        * @param aContainer Pointer to container of browser application.
-        */
-        CHsBrowserHsSrvNotifs( CHsBrowserContainer* aContainer );
-        
-	    /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-        
-    private:
-    
- 	    /**
-        * Container of hotspot browser application.
-        */
-        CHsBrowserContainer* iContainer;
-	};
-
-#endif // HSBROWSERHSSRVNOTIFS_H
-            
-// End of File
-

--- a/hotspotfw/hsbrowser/inc/hsbrowserictsobserver.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Implements callback interface for Internet Connectivity Test Service
-*                notifications.
-*
-*/
-
-
-
-#ifndef HSBROWSERICTSOBSERVER_H
-#define HSBROWSERICTSOBSERVER_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <ictscommon.h>
-
-// FORWARD DECLARATION
-class CHsBrowserContainer;
-
-// CLASS DECLARATION
-/**
-* This class implements callback interface for Internet Connectivity Test Service
-* notifications.
-*/
-class CHsBrowserIctsObserver : public CBase, public MIctsObserver
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aContainer Pointer to container of browser application
-        */
-        static CHsBrowserIctsObserver* NewL( CHsBrowserContainer* aContainer );
-
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserIctsObserver();
-
-    public: // from MIctsObserver
-    
-        /**
-        * From MIctsObserver, ConnectivityObserver 
-        */
-        void ConnectivityObserver( TIctsTestResult aResult, const TDesC& aString );
-        
-    private: // new
-    
-        /**
-        * Process connection ok event.
-        */
-        void ProcessConnectionOk();
-                
-    private:
-    
-        /**
-        * C++ default constructor.
-        *
-        * @param aContainer Pointer to container of browser application.
-        */
-        CHsBrowserIctsObserver( CHsBrowserContainer* aContainer );
-        
-	    /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:
-    
-        /**
-        * Container of hotspot browser application.
-        * Not owned.
-        */
-        CHsBrowserContainer* iContainer;
-    };
-
-#endif // HSBROWSERICTSOBSERVER_H
-            
-// End of File
-

--- a/hotspotfw/hsbrowser/inc/hsbrowserloadeventobserver.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Handle load progress events
-*
-*/
-
-
-
-#ifndef HSBROWSERLOADEVENTOBSERVER_H
-#define HSBROWSERLOADEVENTOBSERVER_H
-
-// INCLUDES
-#include <brctlinterface.h>
-
-// FORWARD DECLARATIONS
-class CHsBrowserContainer;
-
-// CONSTANTS
-_LIT8( KHttp, "http" );
-const TInt KTotalPollingTime = 300000000;
-const TInt KExecutionTimeInterval = 10000000;
-const TInt KBufSize = 4;
-
-// CLASS DECLARATION
-/**
-* This class is used to receive load progress events.
-*/
-class CHsBrowserLoadEventObserver : public CBase, public MBrCtlLoadEventObserver
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHsBrowserLoadEventObserver* NewL( CHsBrowserContainer* aContainer );
-
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserLoadEventObserver();
-    
-    public: // from MBrCtlLoadEventObserver
-    
-        /**
-        * From MBrCtlLoadEventObserver, load events notification.
-        */
-        void HandleBrowserLoadEventL( TBrCtlDefs::TBrCtlLoadEvent aLoadEvent,
-                                      TUint aSize,
-                                      TUint16 aTransactionId) ;
-    private:
-
-		/**
-		* Constructor.
-		*/
-        CHsBrowserLoadEventObserver( CHsBrowserContainer* aContainer );
-
-	    /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-        
-    private: // new
-
-        /**
-        * Update label in the navigation pane.
-        *
-        * @param aName Label for navi pane.
-        */
-        void UpdateNaviLabel( const TDesC& aName );
-        
-        /**
-        * Update name in fast swapper.
-        *
-        * @param aName Name in fast swapper.
-        */
-        void UpdateFastSwapNameL( const TDesC& aName );
-
-        /**
-        * Get page title, udpate navi label and name in fast swapper.
-        */
-        void UpdateNameL();        
-                
-        /**
-        * Start polling internet connection.
-        */
-        void TestInternetConnectivityL();
-        
-        /**
-        * Update boolean flag for internet connectivity test.
-        */
-        void UpdateDoIctFlagL();
-
-    private:   // data
-    
-        /**
-        * Pointer to the container class associated with this observer.
-        */
-        CHsBrowserContainer* iContainer; // not owner
-        
-        /**
-        * Pointer to internet connectivity test object.
-        */
-        CIctsClientInterface* iIcts; // owner
-        
-        /**
-        * Boolean flag for Internet Connectivity Test.
-        */
-        TBool iDoIct;
-
-        /**
-        * Used to differentiate the navibar content: no title shown yet when
-        * we are just loading the logon page
-        */        
-        TBool iIsFirstLoad;
-    };
-
-#endif // HSBROWSERLOADEVENTOBSERVER_H
-            
-// End of File

--- a/hotspotfw/hsbrowser/inc/hsbrowsermodel.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Declaration of HsBrowserModel class.
-*
-*/
-
-
-
-#ifndef HSBROWSERMODEL_H
-#define HSBROWSERMODEL_H
-
-// INCLUDES
-#include <e32base.h>
-#include <es_sock.h>
-#include "hssinterface.h"
-
-// FORWARD DECLARATIONS
-class RConnection;
-class RSocketServ;
-class RHssInterface;
-
-// CLASS DECLARATION
-/**
- * Manages the HsBrowser data.
- */
-class CHsBrowserModel : public CBase
-    {
-
-    public:
-    
-        /**
-        * Static constructor.
-        */
-        static CHsBrowserModel* NewL();
-        
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserModel();
-    
-    public: // new methods
-            
-        /**
-        * Set model state.
-        *
-        * @param aState State of the model.
-        * @param aSendToHss Flag for sending status to hotspot server.
-        */
-        void SetState( TUint aState, TBool aSendToHss );
-        
-        /**
-        * Attach to connection using known iIapId and iNetId.
-        */
-        TInt Attach();
-        
-    public: // access
-    
-        inline TInt IapId() const;        
-        inline TInt NetId() const;
-        inline HBufC* Url();
-        inline RConnection& Connection();
-        inline RSocketServ& SocketServ();
-        inline RHssInterface& HsServer();
-        inline TBool Foreground();
-        inline TUint State();
-        inline TBool LoginCompleteNoteShown(); 
-        inline TInt Position();
-        inline TInt Priority();
-        inline HBufC* StaticTitle();
-        inline HBufC* PageTitle();
-        
-        inline void SetNetId( TInt aNetId );
-        inline void SetIapId( TInt aIapId ); 
-        inline void SetUrl( const TPtrC& aUrl );
-        inline void SetState( TUint aState );
-        inline void SetForeground( TBool aForeground );
-        inline void SetLoginCompleteNoteShown( TBool aLoginCompleteNoteShown ); 
-        inline void SetStaticTitle( const TDesC& aStaticTitle );
-        inline void SetPageTitle( const TDesC& aPageTitle );
-        
-    private:
-    
-        /**
-        * C++ default constructor.
-        */
-        CHsBrowserModel();
-        
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private: // data
-		
-        /**
-        * IAP ID.
-        */
-        TInt iIapId;
-
-        /**
-        * Network ID.
-        */
-        TInt iNetId;
-        
-        /**
-        * URL of web page for user authentication.
-        * Owned.
-        */
-        HBufC* iUrl;
-        
-        /**
-        * The management interface for a network connection.
-        */
-        RConnection iConnection;
-        
-        /**
-        * Provides the Connect() function to create an IPC communication
-        * channel to the socket server.
-        */
-        RSocketServ iSocketServ;
-        
-        /**
-        * Handle to a session with a hotspot server.
-        */
-        RHssInterface iHsServer;
-        
-        /**
-        * Application state. Possible values are EHsBrowserUiUndefined, EHsBrowserUiRunning,
-        * EHsBrowserUiAuthenticatedOk, EHsBrowserUiAuthenticatedNok, EHsBrowserUiClosed, defined
-        * in hotspotclientserver.h
-        */       
-        TUint iState;
-        
-        /**
-        * Boolean flag for foreground state.
-        */
-        TBool iForeground;
-        
-        /**
-        * Boolean flag for showing login complete note.
-        */
-        TBool iLoginCompleteNoteShown;
-        
-        /**
-        * The window's original ordinal position.
-        */
-        TInt iPosition;
-        
-        /**
-        * The window's original ordinal priority. 
-        */
-        TInt iPriority;
-
-        /**
-        * Default page title, "WLAN login" 
-        * Owned.
-        */       
-        HBufC* iStaticTitle;
-
-        /**
-        * Web page title, used instead of default if available. 
-        * Owned.
-        */               
-        HBufC* iPageTitle;
-        
-    };
-
-#include "hsbrowsermodel.inl"
-
-#endif // HSBROWSERMODEL_H
-
-// end of file
-

--- a/hotspotfw/hsbrowser/inc/hsbrowsermodel.inl	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Inline method definitions for CHsBrowserModel.   
-*
-*/
-
-
-
-#ifndef HSBROWSERMODEL_INL
-#define HSBROWSERMODEL_INL
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CHsBrowserModel::IapId
-// ---------------------------------------------------------
-//
-TInt CHsBrowserModel::IapId() const
-    {
-    return iIapId;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetIapId
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetIapId( TInt aIapId )
-    {
-    iIapId = aIapId;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::IapId
-// ---------------------------------------------------------
-//
-TInt CHsBrowserModel::NetId() const
-    {
-    return iNetId;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::Url
-// ---------------------------------------------------------
-//
-HBufC* CHsBrowserModel::Url()
-	{
-	return iUrl;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetNetId
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetNetId( TInt aNetId )
-    {
-    iNetId = aNetId;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::Connection
-// ---------------------------------------------------------
-//
-RConnection& CHsBrowserModel::Connection()
-    {
-    return iConnection;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SocketServ
-// ---------------------------------------------------------
-//
-RSocketServ& CHsBrowserModel::SocketServ()
-    {
-    return iSocketServ;	
-    }
-
-// ---------------------------------------------------------
-// CHsBrowserModel::HsServer
-// ---------------------------------------------------------
-//
-RHssInterface& CHsBrowserModel::HsServer()
-	{
-	return iHsServer;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetUrl
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetUrl( const TPtrC& aUrl )
-	{
-	if ( iUrl )
-		{
-		delete iUrl;
-		iUrl = NULL;
-		}
-	iUrl = aUrl.Alloc();
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::Foreground
-// ---------------------------------------------------------
-//
-TBool CHsBrowserModel::Foreground()
-	{
-	return iForeground;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::State
-// ---------------------------------------------------------
-//
-TUint CHsBrowserModel::State()
-	{
-	return iState;
-	}
-	
-// ---------------------------------------------------------
-// CHsBrowserModel::ShowLoginCompleteNote
-// ---------------------------------------------------------
-//
-/*TBool CHsBrowserModel::ShowLoginCompleteNote()
-	{
-	return iShowLoginCompleteNote;
-	}
-*/
-
-// ---------------------------------------------------------
-// CHsBrowserModel::LoginCompleteNoteShown
-// ---------------------------------------------------------
-//
-TBool CHsBrowserModel::LoginCompleteNoteShown()
-	{
-	return iLoginCompleteNoteShown;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::Position
-// ---------------------------------------------------------
-//
-TInt CHsBrowserModel::Position()
-	{
-	return iPosition;
-	}
-	
-// ---------------------------------------------------------
-// CHsBrowserModel::Priority
-// ---------------------------------------------------------
-//
-TInt CHsBrowserModel::Priority()
-	{
-	return iPriority;
-	}
-
-HBufC* CHsBrowserModel::StaticTitle()
-	{
-	return iStaticTitle;
-	}
-
-HBufC* CHsBrowserModel::PageTitle()
-	{
-	return iPageTitle;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::ShowConnClosedNote
-// ---------------------------------------------------------
-//
-/*
-TBool CHsBrowserModel::ShowConnClosedNote()
-	{
-	return iShowConnClosedNote;
-	}
-*/
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetState
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetState( TUint aState )
-	{
-	iState = aState;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetForeground
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetForeground( TBool aForeground )
-	{
-	iForeground = aForeground;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetShowLoginCompleteNote
-// ---------------------------------------------------------
-//
-/*void CHsBrowserModel::SetShowLoginCompleteNote( TBool aShowLoginCompleteNote )
-	{
-	iShowLoginCompleteNote = aShowLoginCompleteNote;
-	}
-*/
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetLoginCompleteNoteShown
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetLoginCompleteNoteShown(
-    TBool aLoginCompleteNoteShown )
-	{
-	iLoginCompleteNoteShown = aLoginCompleteNoteShown;
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetShowConnClosedNote
-// ---------------------------------------------------------
-//
-/*
-void CHsBrowserModel::SetShowConnClosedNote( TBool aShowConnClosedNote )
-	{
-	iShowConnClosedNote = aShowConnClosedNote;
-	}        
-*/
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetStaticTitle
-// ---------------------------------------------------------
-//
-void CHsBrowserModel::SetStaticTitle( const TDesC& aStaticTitle )
-	{
-	if ( iStaticTitle )
-		{
-		delete iStaticTitle;
-		iStaticTitle = NULL;
-		}
-	iStaticTitle = aStaticTitle.Alloc();
-	}
-
-// ---------------------------------------------------------
-// CHsBrowserModel::SetPageTitle
-// ---------------------------------------------------------
-//        
-void CHsBrowserModel::SetPageTitle( const TDesC& aPageTitle )
-	{
-	if ( iPageTitle )
-		{
-		delete iPageTitle;
-		iPageTitle = NULL;
-		}
-	iPageTitle = aPageTitle.Alloc();
-	}
-
-
-#endif // HSBROWSERMODEL_INL

--- a/hotspotfw/hsbrowser/inc/hsbrowserspecialloadobserver.h	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Handle special load requests like Non-HTTP(S) load requests,
-*                and Non-HTML content. Control over network connections
-*
-*/
-
-
-
-#ifndef HSBROWSERSPECIALLOADOBSERVER_H
-#define HSBROWSERSPECIALLOADOBSERVER_H
-
-//  INCLUDES
-#include <BrCtlSpecialLoadObserver.h>
-#include <brctlinterface.h>
-
-// CLASS DECLARATION
-
-/**
-* CHsBrowserSpecialLoadObserver class.
-* This class inherits from the MBrCtlSpecialLoadObserver interface which
-* is used if the host application requires: Handling of non-HTTP(S) load requests;
-* Handling of non-markup content; Control over network connections
-*/
-class CHsBrowserSpecialLoadObserver : public CBase, public MBrCtlSpecialLoadObserver
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CHsBrowserSpecialLoadObserver* NewL();
-
-        /**
-        * Destructor.
-        */
-        ~CHsBrowserSpecialLoadObserver();
-
-    public: // from MBrCtlSpecialLoadObserver
-    
-        /**
-        * Request to create a network connection.
-        * @since 2.8
-        * @param aConnectionPtr A pointer to the new connection. If NULL, the proxy filter will automatically create a network connection
-        * @param aSockSvrHandle A handle to the socket server.
-        * @param aNewConn A flag if a new connection was created. If the connection is not new, proxy filter optimization will not read the proxy again from CommsBd
-        * @param aBearerType The bearer type of the new connection
-        * @return void
-        */
-        void NetworkConnectionNeededL( TInt* aConnectionPtr,
-                                       TInt* aSockSvrHandle,
-                                       TBool* /*aNewConn*/,
-                                       TApBearerType* /*aBearerType*/ );
-        /**
-        * Request the host applicaion to handle non-http request.
-        * @since 2.8
-        * @param aTypeArray Array of download parameter types. These types indicates the type of data contained within the DesArray
-        * @param aDesArray Array of values associated with the types in the type array.
-        * @return ETrue, If the request is handled by the host application. EFalse if not
-        */
-        TBool HandleRequestL( RArray<TUint>* /*aTypeArray*/,
-                              CDesCArrayFlat* /*aDesArray*/ );
-
-        /**
-        * Request the host applicaion to handle downloads
-        * @since 2.8
-        * @param aTypeArray Array of download parameter types
-        * @param aDesArray Array of values associated with the types in the type array
-        * @return ETrue, If the request is handled by the host application. EFalse if not
-        */
-        TBool HandleDownloadL( RArray<TUint>* /*aTypeArray*/,
-                               CDesCArrayFlat* /*aDesArray*/ );
-        
-    public: // access methods
-    
-        /**
-        * Accessor method for iConnectionPtr.
-        */
-        void SetConnectionPtr( TInt aConnectionPtr );
-        
-        /**
-        * Accessor method for iSockSvrHandle.
-        */
-        void SetSockSvrHandle( TInt aSockSvrHandle );
-
-    private:
-    
-	    /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:
-        
-        /**
-        * Connection handle.
-        */
-        TInt iConnectionPtr;
-    
-        /**
-        * Socket server handle.
-        */
-        TInt iSockSvrHandle;
-    };
-
-#endif // HSBROWSERSPECIALLOADOBSERVER_H
-            
-// End of File
-

--- a/hotspotfw/hsbrowser/loc/hsbrowser.loc	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Localization file.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-//d:A static title is displayed during the rendering of the page, and replaced
-//d:by the web page title when it is available. If the web page does not have
-//d:a title, the static title remains in the status pane.
-//l:status_small_pane_t1/opt3
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wba_static_title "WLAN login" 
-
-//d:As soon as authentication can be detected as complete,
-//d:this information note is displayed,
-//d:and the logon application is sent to background.
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wba_info_complete "Login complete. Application will be sent to background."
-
-//d:If the WLAN connection is closed when logon application is in foreground,
-//d:this information note is displayed and application is closed.
-//l:popup_note_window
-//w:
-//r:3.2
-//
-#define qtn_netw_conset_wba_info_closed "WLAN connection closed. Login application will now exit."
-
-//d:Softkey used in authentication process.
-//l:control_pane_t1/opt7
-//w:
-//r:3.2
-//
-#define text_softkey_continue "Continue"
-
-// End of File

--- a/hotspotfw/hsbrowser/src/hsbrowserapp.cpp	Wed Jun 23 19:25:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:   Implements the main application class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <eikstart.h>
-
-#include "hsbrowserapp.h"
-#include "hsbrowserdocument.h"
-#include "hsbrowsercommon.h"
-#include "am_debug.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CHsBrowserApp::AppDllUid()
-// Returns application UID
-// ---------------------------------------------------------
-//
-TUid CHsBrowserApp::AppDllUid() const
-    {
-    return KUidHsBrowserApp;
-    }
-
-// ---------------------------------------------------------
-// CDictionaryStore* CHsBrowserApp::OpenIniFileLC(RFs& aFs) const
-// overrides CAknApplication::OpenIniFileLC to enable INI file support
-// ---------------------------------------------------------
-//
-CDictionaryStore* CHsBrowserApp::OpenIniFileLC( RFs& aFs ) const
-    {
-    return CEikApplication::OpenIniFileLC( aFs );
-    }
-   
-// ---------------------------------------------------------
-// CHsBrowserApp::CreateDocumentL()
-// Creates CHsBrowserAppDocument object
-// ---------------------------------------------------------
-//
-CApaDocument* CHsBrowserApp::CreateDocumentL()
-    {
-    return CHsBrowserDocument::NewL( *this );
-    }
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-//
-// ---------------------------------------------------------
-// NewApplication() 
-// Constructs CHsBrowserApp
-// Returns: created application object
-// ---------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication( )
-	{
-    return new CHsBrowserApp;
-    }
-    
-// ---------------------------------------------------------
-//    E32Main
-//    Main function for Symbian OS v9 EXE application
-//    Returns: TInt
-// ---------------------------------------------------------
-GLDEF_C TInt E32Main()
-    {
-	DEBUG( "***** Starting Hotspot Browser Logon Application..." );
-    return EikStart::RunApplication( NewApplication );
-    }
-
-// End of File