FCL/sf/app/webuis: comparison browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp

equal deleted inserted replaced

-:aead3f7e1bb0
+:b149f0820e5a
 }
 delete iDomainFolderName;
 delete iItemsToMove;
 delete iCurrentOrder;
 delete iEnteredURL;
-iEnteredURL = NULL;
+delete iAsyncComplete;
 BROWSER_LOG( ( _L("delete iEnteredUrl 1") ) );
 iCursorPos = -1;
 }
 // ----------------------------------------------------------------------------
 {
 // default case for everything else is Back
 aRsk.setPair(EBrowserBookmarksCmdBack, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_BACK);
 // OR, it could be exit under these conditions
-if ( !iInAdaptiveBookmarksFolder && !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching() )
+if ( !ApiProvider().StartedUp() ||
+(!iInAdaptiveBookmarksFolder && !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching())  )
 {
 if ( iCurrentFolder == KFavouritesRootUid )
 {
 aRsk.setPair(EAknSoftkeyExit, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_EXIT);
 }
 //thread, its important to refresh when the thread notifies the fresh data.
 //Call to GetItemsLC above, which inturn calls ManualBMSortL will set iRefresh to false
 //Make it true so that latest FavIcon db info is shown
 iRefresh = ETrue;
+#ifndef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
 Toolbar()->HideItem( EWmlCmdAddBookmark, ETrue , EFalse);
 //disable both the goto items and activate one of them depending on availability of search feature during bookmarks activation
 Toolbar()->HideItem( EWmlCmdGoToAddress, ETrue , EFalse);
 Toolbar()->HideItem( EWmlCmdGoToAddressAndSearch, ETrue , EFalse );
 Toolbar()->HideItem( EWmlCmdPreferences, ETrue , EFalse);
 #endif
 Cba()->MakeVisible( EFalse);
 StatusPane()->MakeVisible( EFalse );
+#endif
 if (iPenEnabled)
 {
 Toolbar()->SetToolbarObserver(this);
 }
 MoveItemsL();
 return;
 }
 else if ( Container()->Listbox()->CurrentItem() )
 {
+//complete remaining startup in Browser and then proceed
+if ( !ApiProvider().StartedUp() )
+ApiProvider().CompleteDelayedInit();
 if ( Container()->Listbox()->CurrentItem()->IsItem())
 {
 ActivateCurrentBookmarkL();
 return;
 }
 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
 }
 #endif
 // downloads
-aMenuPane->SetItemDimmed( EWmlCmdDownloads, !ApiProvider().BrCtlInterface().BrowserSettingL( TBrCtlDefs::ESettingsNumOfDownloads ) );
+if(ApiProvider().StartedUp())
+aMenuPane->SetItemDimmed( EWmlCmdDownloads, !ApiProvider().BrCtlInterface().BrowserSettingL( TBrCtlDefs::ESettingsNumOfDownloads ) );
 // edit
 if ( !item || (iInAdaptiveBookmarksFolder && aState.IsEmpty() ))
 {
 aMenuPane->SetItemDimmed( EWmlCmdManageBookmarks, ETrue );
 break;
 }
 case R_GOTO_SUBMENU:
 {
 // back to page
-if ( !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching())
+if ( !ApiProvider().StartedUp() || (!ApiProvider().IsPageLoaded() && !ApiProvider().Fetching()))
 {
 aMenuPane->SetItemDimmed( EWmlCmdBackToPage, ETrue );
 }
 // bookmarks
 PERFLOG_LOCAL_INIT
 PERFLOG_STOPWATCH_START
 LOG_ENTERFN("CBrowserBookmarksView::DoActivateL");
 LOG_WRITE_FORMAT(" aCustomMessageId: %d", aCustomMessageId);
+#ifdef BRDO_PERF_IMPROVEMENTS_ENABLED_FF
+// Quick activation for first time only to show bookmarks view fast
+if(!ApiProvider().StartedUp())
+{
+CBrowserFavouritesView::DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage );
+if ( aCustomMessageId == KUidCustomMsgDownloadsList )
+{
+iShowDownlods = ETrue;
+// Show the downloads later since contentview has not initialized yet
+}
+// complete remaining application launch process, aynchronously
+iAsyncComplete  = CIdle::NewL( CActive::EPriorityIdle );
+iAsyncComplete->Start( TCallBack( CompleteAppInitCallback, &iApiProvider ) );
+return;
+}
+#endif
 Toolbar()->HideItem( EWmlCmdAddBookmark, EFalse , ETrue);
 #ifndef BRDO_SINGLE_CLICK_ENABLED_FF
 Toolbar()->HideItem( EWmlCmdDelete, EFalse , ETrue);
 #else
 PERFLOG_STOP_WRITE("BMView DoActivate")
 //  LOG_LEAVEFN("CBrowserBookmarksView::DoActivateL");
 }
 // ----------------------------------------------------------------------------
+// CBrowserBookmarksView::CompleteAppInitCallback
+// ----------------------------------------------------------------------------
+//
+TInt CBrowserBookmarksView::CompleteAppInitCallback( TAny* aProvider )
+{
+MApiProvider  *apiProvider = STATIC_CAST(MApiProvider*, aProvider);
+TBool result = apiProvider->CompleteDelayedInit();
+return result;
+}
+// ----------------------------------------------------------------------------
+// CBrowserBookmarksView::UpdateFavIcons
+// ----------------------------------------------------------------------------
+//
+void CBrowserBookmarksView::UpdateFavIconsL()
+{
+Container()->Listbox()->UpdateFavIconsL();
+}
+// ----------------------------------------------------------------------------
+// CBrowserBookmarksView::CheckForDownloads
+// ----------------------------------------------------------------------------
+//
+void CBrowserBookmarksView::CheckForDownloads()
+{
+if(iShowDownlods)
+{
+if ( iDownloadsListExecuter == 0 )
+iDownloadsListExecuter = new (ELeave) CAsyncDownloadsListExecuter( ApiProvider() );
+iDownloadsListExecuter->Start();
+}
+}
+// ----------------------------------------------------------------------------
 // CBrowserBookmarksView::DoDeactivate
 // ----------------------------------------------------------------------------
 //
 void CBrowserBookmarksView::DoDeactivate()
 {
 {
 ExitAdaptiveBookmarks();
 }
 if ( !ApiProvider().ExitInProgress() )
 {
-ApiProvider().BrCtlInterface().RemoveLoadEventObserver( this );
+if ( ApiProvider().StartedUp() )
+ApiProvider().BrCtlInterface().RemoveLoadEventObserver( this );
 }
 CBrowserFavouritesView::DoDeactivate();
 iManualItemMovingGoingOn = EFalse;
 // UnDim Toolbar buttons
 DimToolbarButtons(EFalse);

branch	RCL_3
changeset 60	b149f0820e5a
parent 55	08ffbd51e3fd
child 62	5a044f6358c2