wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 805600 - Code cleanup: remove sIsGeckoReady; r=kats

Browse Source
This commit is contained in:
Geoff Brown 2012-10-27 13:18:26 -06:00
parent 85146049a7
commit 302506ba79
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/AboutHomeContent.java
View File

@ -463,7 +463,7 @@ public class AboutHomeContent extends ScrollView
}
private void readLastTabs() {
String jsonString = mActivity.getProfile().readSessionFile(GeckoApp.sIsGeckoReady);
String jsonString = mActivity.getProfile().readSessionFile(GeckoApp.checkLaunchState(GeckoApp.LaunchState.GeckoRunning));
if (jsonString == null) {
// no previous session data
return;

4
mobile/android/base/BrowserApp.java
View File

@ -462,7 +462,7 @@ abstract public class BrowserApp extends GeckoApp
}
private void showTabs(TabsPanel.Panel panel) {
if (!sIsGeckoReady)
if (!checkLaunchState(LaunchState.GeckoRunning))
return;
mTabsPanel.show(panel);
@ -846,7 +846,7 @@ abstract public class BrowserApp extends GeckoApp
if (aMenu == null)
return false;
if (!sIsGeckoReady)
if (!checkLaunchState(LaunchState.GeckoRunning))
aMenu.findItem(R.id.settings).setEnabled(false);
Tab tab = Tabs.getInstance().getSelectedTab();

2
mobile/android/base/GeckoApp.java
View File

@ -163,7 +163,6 @@ abstract public class GeckoApp
private static GeckoThread sGeckoThread;
public Handler mMainHandler;
private GeckoProfile mProfile;
public static boolean sIsGeckoReady = false;
public static int mOrientation;
private boolean mIsRestoringActivity;
private String mCurrentResponse = "";
@ -979,7 +978,6 @@ abstract public class GeckoApp
handlePageShow(tabId);
} else if (event.equals("Gecko:Ready")) {
mGeckoReadyStartupTimer.stop();
sIsGeckoReady = true;
setLaunchState(GeckoApp.LaunchState.GeckoRunning);
GeckoAppShell.sendPendingEventsToGecko();
connectGeckoLayerClient();