4 files changed, 11 insertions, 4 deletions
diff --git a/src/widgets/BrowserApp.cpp b/src/widgets/BrowserApp.cpp
index 3cd06b4..9a4e1cf 100644
--- a/src/widgets/BrowserApp.cpp
+++ b/src/widgets/BrowserApp.cpp
@@ -16,9 +16,8 @@ BrowserApp::BrowserApp() {
 
 BrowserWindow *BrowserApp::create_window() {
   auto *win = new BrowserWindow((const Configuration &)configuration);
+  WindowActionRouter::instance()->add_window(win);
   win->setWindowTitle("null-browser");
-  auto *router = WindowActionRouter::instance();
-  router->add_window(win);
   win->show();
   return win;
 }
diff --git a/src/widgets/BrowserWindow.hpp b/src/widgets/BrowserWindow.hpp
index 6036ec1..364aa12 100644
--- a/src/widgets/BrowserWindow.hpp
+++ b/src/widgets/BrowserWindow.hpp
@@ -6,15 +6,23 @@
 #include "WindowMediator.hpp"
 #include "utils.hpp"
 
+using WindowId = uint64_t;
+
 class BrowserWindow : public QMainWindow {
 public:
   BrowserWindow(const Configuration &configuration);
 
   DEFINE_GETTER(mediator, input_mediator)
+  DEFINE_GETTER(get_id, win_id)
+  DEFINE_SETTER(set_id, win_id)
 
   bool on_window_key_event(QKeyEvent *event);
 
 private:
   WindowMediator *input_mediator;
   const Configuration &configuration;
+
+  WindowId win_id = -1;
 };
+
+using WindowMap = std::unordered_map<uint64_t, BrowserWindow *>;
diff --git a/src/widgets/WebViewStack.cpp b/src/widgets/WebViewStack.cpp
index 6265855..5ec6364 100644
--- a/src/widgets/WebViewStack.cpp
+++ b/src/widgets/WebViewStack.cpp
@@ -8,6 +8,8 @@
 
 #include "widgets/WebViewStack.hpp"
 
+static WebViewId next_webview_id = 1;
+
 WebViewStack::WebViewStack(const Configuration *configuration,
                            QWebEngineProfile *profile, QWidget *parent)
     : QWidget(parent), configuration(configuration), profile(profile) {
diff --git a/src/widgets/WebViewStack.hpp b/src/widgets/WebViewStack.hpp
index 03581e8..40c2184 100644
--- a/src/widgets/WebViewStack.hpp
+++ b/src/widgets/WebViewStack.hpp
@@ -23,8 +23,6 @@ struct WebViewData {
   QString title;
 };
 
-static WebViewId next_webview_id = 1;
-
 class WebViewStack : public QWidget {
   Q_OBJECT