Bug 720494 - Move GeckoApp.handleAddTab logic into Tabs.addTab. r=mbrubeck

mobile/android/base/GeckoApp.java

@@ -951,8 +951,8 @@ abstract public class GeckoApp
                 //GeckoApp.mAppContext.doCameraCapture(message.getString("path"));
                 doCameraCapture();
             } else if (event.equals("Tab:Added")) {
-                Log.i(LOGTAG, "Created a new tab");
-                Tab tab = handleAddTab(message);
+                Log.i(LOGTAG, "Received message from Gecko: " + SystemClock.uptimeMillis() + " - Tab:Added");
+                Tab tab = Tabs.getInstance().addTab(message);
                 Boolean selected = message.getBoolean("selected");
                 if (selected)
                     Tabs.getInstance().selectTab(tab.getId());
@@ -1216,19 +1216,6 @@ abstract public class GeckoApp
         });
     }
 
-    Tab handleAddTab(JSONObject params) throws JSONException {
-        Log.i(LOGTAG, params.toString());
-        final Tab tab = Tabs.getInstance().addTab(params);
-
-        mMainHandler.post(new Runnable() {
-            public void run() {
-                mBrowserToolbar.updateTabs(Tabs.getInstance().getCount());
-            }
-        });
-
-        return tab;
-    }
-
     void handleDocumentStart(int tabId, final boolean showProgress) {
         final Tab tab = Tabs.getInstance().getTab(tabId);
         if (tab == null)
@@ -2379,6 +2366,7 @@ abstract public class GeckoApp
             Log.e(LOGTAG, "error building JSON arguments");
         }
         if (type == AwesomeBar.Type.ADD) {
+            Log.i(LOGTAG, "Sending message to Gecko: " + SystemClock.uptimeMillis() + " - Tab:Add");
             GeckoAppShell.sendEventToGecko(new GeckoEvent("Tab:Add", args.toString()));
         } else {
             GeckoAppShell.sendEventToGecko(new GeckoEvent("Tab:Load", args.toString()));
@@ -2415,6 +2403,7 @@ abstract public class GeckoApp
         } catch (Exception e) {
             Log.e(LOGTAG, "error building JSON arguments");
         }
+        Log.i(LOGTAG, "Sending message to Gecko: " + SystemClock.uptimeMillis() + " - Tab:Add");
         GeckoAppShell.sendEventToGecko(new GeckoEvent("Tab:Add", args.toString()));
     }
 

mobile/android/base/Tabs.java

@@ -82,6 +82,13 @@ public class Tabs implements GeckoEventListener {
         Tab tab = new Tab(id, url, external, parentId, title);
         tabs.put(id, tab);
         order.add(tab);
+
+        GeckoApp.mAppContext.mMainHandler.post(new Runnable() {
+            public void run() {
+                GeckoApp.mBrowserToolbar.updateTabs(getCount());
+            }
+        });
+
         Log.i(LOGTAG, "Added a tab with id: " + id + ", url: " + url);
         return tab;
     }