equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of "Eclipse Public License v1.0" |
5 * under the terms of "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
12 * Contributors: |
12 * Contributors: |
13 * |
13 * |
14 * Description: Handles LaunchBrowser command |
14 * Description: Handles LaunchBrowser command |
15 * |
15 * |
16 */ |
16 */ |
|
17 |
17 |
18 |
18 |
19 |
19 #include <MSatShellController.h> |
20 #include <MSatShellController.h> |
20 #include <cmmanager.h> |
21 #include <cmmanager.h> |
21 #include <cmconnectionmethod.h> |
22 #include <cmconnectionmethod.h> |
209 { |
210 { |
210 LOG( NORMAL, |
211 LOG( NORMAL, |
211 "LAUNCHBROWSER::Event ESetUpMenuRequested catched and unreg" ) |
212 "LAUNCHBROWSER::Event ESetUpMenuRequested catched and unreg" ) |
212 iUtils->UnregisterEvent( this, MSatUtils::ESetUpMenuRequested ); |
213 iUtils->UnregisterEvent( this, MSatUtils::ESetUpMenuRequested ); |
213 // Browser is brought to the top after short period of time. |
214 // Browser is brought to the top after short period of time. |
214 iUtils->SatUiHandler().ShellController(). |
215 //iUtils->SatUiHandler().ShellController(). |
215 BringBrowserToForegroundAfterPeriod(); |
216 // BringBrowserToForegroundAfterPeriod(); |
216 break; |
217 break; |
217 } |
218 } |
218 |
219 |
219 default: |
220 default: |
220 { |
221 { |
807 LOG3( SIMPLE, |
808 LOG3( SIMPLE, |
808 "LAUNCHBROWSER: CLaunchBrowserHandler::LaunchWithUrlL\ |
809 "LAUNCHBROWSER: CLaunchBrowserHandler::LaunchWithUrlL\ |
809 url=%s, IAP=%d", &aParam, aAccessPointUid.iUid ) |
810 url=%s, IAP=%d", &aParam, aAccessPointUid.iUid ) |
810 |
811 |
811 // Browser launching called. |
812 // Browser launching called. |
812 TInt err = iUtils->SatUiHandler().ShellController().LaunchBrowserL( |
813 //TInt err = iUtils->SatUiHandler().ShellController().LaunchBrowserL( |
813 aParam, aAccessPointUid ); |
814 // aParam, aAccessPointUid ); |
|
815 TInt err = KErrNone; |
814 |
816 |
815 if ( KErrNone == err ) |
817 if ( KErrNone == err ) |
816 { |
818 { |
817 if ( !iQueryRsp.iRequestedIconDisplayed && |
819 if ( !iQueryRsp.iRequestedIconDisplayed && |
818 ( ( RSat::ESelfExplanatory == |
820 ( ( RSat::ESelfExplanatory == |