Browser: Avoid ninja-import of global variable

4 files changed, 39 insertions, 3 deletions

diff --git a/Applications/Browser/Browser.h b/Applications/Browser/Browser.h
new file mode 100644
index 0000000000..a4a4eefe1f
--- /dev/null
+++ b/Applications/Browser/Browser.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, the SerenityOS developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/String.h>
+
+namespace Browser {
+
+extern String g_home_url;
+
+}
diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp
index 5cfa5c9cda..16235b54ef 100644
--- a/Applications/Browser/Tab.cpp
+++ b/Applications/Browser/Tab.cpp
@@ -26,6 +26,7 @@
 
 #include "Tab.h"
 #include "BookmarksBarWidget.h"
+#include "Browser.h"
 #include "ConsoleWidget.h"
 #include "DownloadWidget.h"
 #include "InspectorWidget.h"
@@ -60,8 +61,6 @@
 
 namespace Browser {
 
-extern String g_home_url;
-
 URL url_from_user_input(const String& input)
 {
     auto url = URL(input);
diff --git a/Applications/Browser/Tab.h b/Applications/Browser/Tab.h
index 7cd066504d..d4adae00cd 100644
--- a/Applications/Browser/Tab.h
+++ b/Applications/Browser/Tab.h
@@ -111,4 +111,6 @@ private:
     RefPtr<const Gfx::Bitmap> m_icon;
 };
 
+URL url_from_user_input(const String& input);
+
 }
diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp
index c7b0872368..8c6191f8fa 100644
--- a/Applications/Browser/main.cpp
+++ b/Applications/Browser/main.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "BookmarksBarWidget.h"
+#include "Browser.h"
 #include "InspectorWidget.h"
 #include "Tab.h"
 #include "WindowActions.h"
@@ -46,7 +47,6 @@
 namespace Browser {
 
 String g_home_url;
-URL url_from_user_input(const String& input);
 bool g_multi_process = false;
 
 static String bookmarks_file_path()