Minor cleanup to Gerrit module bootstrap code path

Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/main/java/com/google/gerrit/client/Gerrit.java b/src/main/java/com/google/gerrit/client/Gerrit.java
index 3ae578a285..544e95817f 100644
--- a/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -291,26 +291,23 @@ public class Gerrit implements EntryPoint {
               } else {
                 Cookies.removeCookie(ACCOUNT_COOKIE);
               }
-              refreshMenuBar();
-              showInitialScreen();
+              onModuleLoad3();
             }
 
             public void onFailure(final Throwable caught) {
-              if (!GWT.isScript() && !GerritCallback.isNotSignedIn(caught)) {
-                GWT.log("Unexpected failure from validating account", caught);
-              }
+              GWT.log("Unexpected failure from validating account", caught);
               Cookies.removeCookie(ACCOUNT_COOKIE);
-              refreshMenuBar();
-              showInitialScreen();
+              onModuleLoad3();
             }
           });
     } else {
-      refreshMenuBar();
-      showInitialScreen();
+      onModuleLoad3();
     }
   }
 
-  private void showInitialScreen() {
+  private void onModuleLoad3() {
+    refreshMenuBar();
+
     final RootPanel sg = RootPanel.get("gerrit_startinggerrit");
     sg.getElement().getParentElement().removeChild(sg.getElement());
     RootPanel.detachNow(sg);