equal
deleted
inserted
replaced
610 { |
610 { |
611 iWindowManager = CBrowserWindowManager::NewL( *this, *contentView, |
611 iWindowManager = CBrowserWindowManager::NewL( *this, *contentView, |
612 KMaxNumOfOpenedWindows ); |
612 KMaxNumOfOpenedWindows ); |
613 } |
613 } |
614 LOG_WRITE_FORMAT("WindowManager Up. Max windows number. %d", |
614 LOG_WRITE_FORMAT("WindowManager Up. Max windows number. %d", |
615 KMaxNumOfOpenedWindows ); |
615 KMaxNumOfOpenedWindows ); |
616 |
|
617 // bug fix for: EMBI-6NBAYM |
|
618 // Be very careful of the location to initialize the iPopupEngine before |
|
619 // PopupEngine is improved. |
|
620 iPopupEngine = CBrowserPopupEngine::NewL(); |
|
621 BROWSER_LOG( ( _L( "PopupEngine up" ) ) ); |
|
622 } |
616 } |
623 else |
617 else |
624 { |
618 { |
625 iWindowManager = CBrowserWindowManager::NewL( *this, *contentView, |
619 iWindowManager = CBrowserWindowManager::NewL( *this, *contentView, |
626 KMinNumOfOpenedWindows ); |
620 KMinNumOfOpenedWindows ); |
913 // |
907 // |
914 case EWmlCmdSwitchWindow: |
908 case EWmlCmdSwitchWindow: |
915 { |
909 { |
916 if(WindowMgr().WindowCount() > 1) |
910 if(WindowMgr().WindowCount() > 1) |
917 { |
911 { |
|
912 #ifdef BRDO_MULTITOUCH_ENABLED_FF |
918 // use switch window tab view if pageoverview bitmaps are available |
913 // use switch window tab view if pageoverview bitmaps are available |
919 if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage )) |
914 if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage ) |
|
915 || Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory )) |
|
916 #else |
|
917 // use switch window tab view if pageoverview bitmaps are available |
|
918 if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage )) |
|
919 #endif |
920 { |
920 { |
921 SetViewToBeActivatedIfNeededL( KUidBrowserWindowSelectionViewId ); |
921 SetViewToBeActivatedIfNeededL( KUidBrowserWindowSelectionViewId ); |
922 } |
922 } |
923 else |
923 else |
924 { |
924 { |
1792 // CBrowserAppUi::PopupEngine |
1792 // CBrowserAppUi::PopupEngine |
1793 // ----------------------------------------------------------------------------- |
1793 // ----------------------------------------------------------------------------- |
1794 // |
1794 // |
1795 CBrowserPopupEngine& CBrowserAppUi::PopupEngine() const |
1795 CBrowserPopupEngine& CBrowserAppUi::PopupEngine() const |
1796 { |
1796 { |
|
1797 if(!iPopupEngine) |
|
1798 { |
|
1799 if ( Preferences().UiLocalFeatureSupported( KBrowserMultipleWindows ) ) |
|
1800 { |
|
1801 iPopupEngine = CBrowserPopupEngine::NewL(); |
|
1802 BROWSER_LOG( ( _L( "PopupEngine up" ) ) ); |
|
1803 } |
|
1804 } |
1797 return *iPopupEngine; |
1805 return *iPopupEngine; |
1798 } |
1806 } |
1799 |
1807 |
1800 // ----------------------------------------------------------------------------- |
1808 // ----------------------------------------------------------------------------- |
1801 // CBrowserAppUi::WindowMgr() |
1809 // CBrowserAppUi::WindowMgr() |