equal
deleted
inserted
replaced
16 * |
16 * |
17 */ |
17 */ |
18 |
18 |
19 |
19 |
20 // INCLUDE FILES |
20 // INCLUDE FILES |
|
21 #include <browser_platform_variant.hrh> |
21 #include "BrowserContentView.h" // not used, to be removed |
22 #include "BrowserContentView.h" // not used, to be removed |
22 #include "BrowserSpecialLoadObserver.h" |
23 #include "BrowserSpecialLoadObserver.h" |
23 #include "BrowserLoadObserver.h" |
24 #include "BrowserLoadObserver.h" |
24 #include "logger.h" |
25 #include "logger.h" |
25 #include "BrowserAppDocument.h" |
26 #include "BrowserAppDocument.h" |
140 BROWSER_LOG((_L("not connected."))); |
141 BROWSER_LOG((_L("not connected."))); |
141 *aNewConn = ETrue; |
142 *aNewConn = ETrue; |
142 TBool isValid( EFalse ); |
143 TBool isValid( EFalse ); |
143 TUint32 ap( 0 ); |
144 TUint32 ap( 0 ); |
144 TInt err( KErrNone ); |
145 TInt err( KErrNone ); |
145 |
146 #ifndef BRDO_OCC_ENABLED_FF |
146 BROWSER_LOG((_L("AP selectionMode: %d."), |
147 BROWSER_LOG((_L("AP selectionMode: %d."), |
147 iApiProvider->Preferences().AccessPointSelectionMode() )); |
148 iApiProvider->Preferences().AccessPointSelectionMode() )); |
148 |
149 |
149 //determine the type of connection |
150 //determine the type of connection |
150 switch (iApiProvider->Preferences().AccessPointSelectionMode() ) |
151 switch (iApiProvider->Preferences().AccessPointSelectionMode() ) |
255 |
256 |
256 default: |
257 default: |
257 { |
258 { |
258 BROWSER_LOG((_L("wrong type of connection"))); |
259 BROWSER_LOG((_L("wrong type of connection"))); |
259 } |
260 } |
260 } //switch |
261 } //switch |
261 |
262 #else //BRDO_OCC_ENABLED_FF |
|
263 isValid = ETrue; |
|
264 #endif //BRDO_OCC_ENABLED_FF |
262 BROWSER_LOG((_L("isValid 2: %d"), isValid)); |
265 BROWSER_LOG((_L("isValid 2: %d"), isValid)); |
263 if( isValid ) |
266 if( isValid ) |
264 { |
267 { |
265 iConnectionCancelled = EFalse; |
268 iConnectionCancelled = EFalse; |
266 if( !iApiProvider->Connection().Connected() ) |
269 if( !iApiProvider->Connection().Connected() ) |