28 #include <StringLoader.h> |
27 #include <StringLoader.h> |
29 #include <e32def.h> |
28 #include <e32def.h> |
30 #include <aplistitemlist.h> |
29 #include <aplistitemlist.h> |
31 #include <aplistitem.h> |
30 #include <aplistitem.h> |
32 #include <apparc.h> |
31 #include <apparc.h> |
33 #include "favouritesfile.h" |
32 #include <favouritesfile.h> |
34 #include <aknmessagequerydialog.h> |
33 #include <aknmessagequerydialog.h> |
35 #include <FeatMgr.h> |
34 #include <FeatMgr.h> |
36 #include <internetconnectionmanager.h> |
35 #include <internetconnectionmanager.h> |
37 #include <APSettingsHandlerUi.h> |
36 #include <APSettingsHandlerUi.h> |
38 #include <UriUtilsCommon.h> |
37 #include <UriUtilsCommon.h> |
47 #endif |
46 #endif |
48 |
47 |
49 #include <browserplugininterface.h> |
48 #include <browserplugininterface.h> |
50 #include <oommonitorplugin.h> |
49 #include <oommonitorplugin.h> |
51 |
50 |
52 #include "browseroverriddensettings.h" |
51 #include <browseroverriddensettings.h> |
53 #include "BrowserLauncherService.h" |
52 #include "BrowserLauncherService.h" |
54 |
53 |
55 #include "cookiemanagerclient.h" |
54 #include "cookiemanagerclient.h" |
56 |
55 |
57 #ifdef __SERIES60_HELP |
56 #ifdef __SERIES60_HELP |
58 #include <hlplch.h> |
57 #include <hlplch.h> |
59 #endif //__SERIES60_HELP |
58 #endif //__SERIES60_HELP |
60 |
59 |
61 #include "BrowserAppDocument.h" |
60 #include "BrowserAppDocument.h" |
62 #include "downloadedcontenthandler.h" |
61 #include <downloadedcontenthandler.h> |
63 #include "BrowserBmOTABinSender.h" |
62 #include "BrowserBmOTABinSender.h" |
64 #include "BrowserCommandLineParser.h" |
63 #include "BrowserCommandLineParser.h" |
65 #include "BrowserApplication.h" |
64 #include "BrowserApplication.h" |
66 #include "BrowserContentView.h" |
65 #include "BrowserContentView.h" |
67 #include "BrowserContentViewContainer.h" |
66 #include "BrowserContentViewContainer.h" |
81 #include "BrowserWindowQueue.h" |
80 #include "BrowserWindowQueue.h" |
82 #include "Logger.h" |
81 #include "Logger.h" |
83 #include <data_caging_path_literals.hrh> |
82 #include <data_caging_path_literals.hrh> |
84 |
83 |
85 #include <brctldefs.h> |
84 #include <brctldefs.h> |
86 #include "browserdialogsprovider.h" |
85 #include <browserdialogsprovider.h> |
87 #include "BrowserSoftkeysObserver.h" |
86 #include "BrowserSoftkeysObserver.h" |
88 #include "BrowserLoadObserver.h" |
87 #include "BrowserLoadObserver.h" |
89 #include "BrowserSpecialLoadObserver.h" |
88 #include "BrowserSpecialLoadObserver.h" |
90 #include "BrowserAsyncExit.h" |
89 #include "BrowserAsyncExit.h" |
91 #include "CommonConstants.h" |
90 #include "CommonConstants.h" |
2817 { |
2816 { |
2818 GetBookmarksView()->OpenAdaptiveBookmarksWhenActivated(); |
2817 GetBookmarksView()->OpenAdaptiveBookmarksWhenActivated(); |
2819 } |
2818 } |
2820 SetViewToBeActivatedIfNeededL( KUidBrowserBookmarksViewId ); |
2819 SetViewToBeActivatedIfNeededL( KUidBrowserBookmarksViewId ); |
2821 } |
2820 } |
|
2821 else if ( IsEmbeddedModeOn()) |
|
2822 { |
|
2823 if( !iExitInProgress ) |
|
2824 { |
|
2825 ExitBrowser( ETrue ); |
|
2826 } |
|
2827 } |
2822 else |
2828 else |
2823 { |
2829 { |
2824 if(CalledFromAnotherApp() && (!IsEmbeddedModeOn())) |
2830 if(CalledFromAnotherApp() && (!IsEmbeddedModeOn())) |
2825 { |
2831 { |
2826 SetViewToBeActivatedIfNeededL( GetPreviousViewFromViewHistory()); |
2832 SetViewToBeActivatedIfNeededL( GetPreviousViewFromViewHistory()); |