Ticket #12850: load_url_in_new_tab.patch

src/apps/webpositive/BrowserApp.cpp

@@ -64 +64 @@
 const char* kApplicationSignature = "application/x-vnd.Haiku-WebPositive";
 const char* kApplicationName = B_TRANSLATE_SYSTEM_NAME("WebPositive");
 static const uint32 PRELOAD_BROWSING_HISTORY = 'plbh';
+static const uint32 LOAD_PASSED_URL = 'lurl';
 
 #define ENABLE_NATIVE_COOKIES 1
 
@@ -225 +226 @@
 
     int32 pagesCreated = 0;
     bool fullscreen = false;
-    if (fLaunchRefsMessage) {
-        _RefsReceived(fLaunchRefsMessage, &pagesCreated, &fullscreen);
-        delete fLaunchRefsMessage;
-        fLaunchRefsMessage = NULL;
-    }
 
-    // If no refs led to a new open page, restore previous session.
-    if (pagesCreated == 0) {
-        BMessage archivedWindow;
-        for (int i = 0; fSession->FindMessage("window", i, &archivedWindow) == B_OK;
-            i++) {
-            BRect frame = archivedWindow.FindRect("window frame");
-            BString url;
-            archivedWindow.FindString("tab", 0, &url);
-            BrowserWindow* window = new(std::nothrow) BrowserWindow(frame,
-                fSettings, url, fContext);
-
-            if (window != NULL) {
-                window->Show();
+    BMessage archivedWindow;
+    for (int i = 0; fSession->FindMessage("window", i, &archivedWindow) == B_OK;
+        i++) {
+        BRect frame = archivedWindow.FindRect("window frame");
+        BString url;
+        archivedWindow.FindString("tab", 0, &url);
+        BrowserWindow* window = new(std::nothrow) BrowserWindow(frame,
+            fSettings, url, fContext);
+        if (window != NULL) {
+            window->Show();
+            pagesCreated++;
+            for (int j = 1; archivedWindow.FindString("tab", j, &url) == B_OK;
+                j++) {
+                printf("Create %d:%d\n", i, j);
+                _CreateNewTab(window, url, false);
                 pagesCreated++;
-
-                for (int j = 1; archivedWindow.FindString("tab", j, &url) == B_OK;
-                    j++) {
-                    printf("Create %d:%d\n", i, j);
-                    _CreateNewTab(window, url, false);
-                    pagesCreated++;
-                }
             }
         }
     }
 
-    // If previous session did not contain any window, create a new empty one.
     if (pagesCreated == 0)
         _CreateNewWindow("", fullscreen);
 
     PostMessage(PRELOAD_BROWSING_HISTORY);
+    PostMessage(LOAD_PASSED_URL);
 }
 
 
@@ -323 +314 @@
     case ADD_CONSOLE_MESSAGE:
         fConsoleWindow->PostMessage(message);
         break;
-
+    case LOAD_PASSED_URL:
+        if (fLaunchRefsMessage) {
+            int32 pagesCreated;
+            bool fullscreen;
+            _RefsReceived(fLaunchRefsMessage, &pagesCreated, &fullscreen);
+            delete fLaunchRefsMessage;
+            fLaunchRefsMessage = NULL;
+        }
+        break;
     default:
         BApplication::MessageReceived(message);
         break;