diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp index 18a690ddb2..d56878e8f6 100644 --- a/Applications/Browser/Tab.cpp +++ b/Applications/Browser/Tab.cpp @@ -50,14 +50,14 @@ #include #include #include +#include #include #include #include #include #include -#include -#include #include +#include namespace Browser { @@ -85,7 +85,7 @@ Tab::Tab(Type type) if (m_type == Type::InProcessWebView) m_page_view = widget.add(); else - m_web_content_view = widget.add(); + m_web_content_view = widget.add(); m_go_back_action = GUI::CommonActions::make_go_back_action([this](auto&) { go_back(); }, this); m_go_forward_action = GUI::CommonActions::make_go_forward_action([this](auto&) { go_forward(); }, this); diff --git a/Applications/Browser/Tab.h b/Applications/Browser/Tab.h index c7adea48ad..5598cff65b 100644 --- a/Applications/Browser/Tab.h +++ b/Applications/Browser/Tab.h @@ -32,9 +32,8 @@ #include #include -class OutOfProcessWebView; - namespace Web { +class OutOfProcessWebView; class WebViewHooks; } @@ -88,7 +87,7 @@ private: History m_history; RefPtr m_page_view; - RefPtr m_web_content_view; + RefPtr m_web_content_view; RefPtr m_go_back_action; RefPtr m_go_forward_action; diff --git a/Applications/Spreadsheet/HelpWindow.cpp b/Applications/Spreadsheet/HelpWindow.cpp index f016abffa8..0e77343455 100644 --- a/Applications/Spreadsheet/HelpWindow.cpp +++ b/Applications/Spreadsheet/HelpWindow.cpp @@ -95,8 +95,7 @@ HelpWindow::HelpWindow(GUI::Window* parent) m_listview = &list_view; list_view.set_model(HelpListModel::create()); - // FIXME: This should be in the Web namespace! - m_webview = &splitter.add(); + m_webview = &splitter.add(); list_view.on_activation = [this](auto& index) { if (!m_webview) diff --git a/Applications/Spreadsheet/HelpWindow.h b/Applications/Spreadsheet/HelpWindow.h index 5160e44f95..32a2276f5e 100644 --- a/Applications/Spreadsheet/HelpWindow.h +++ b/Applications/Spreadsheet/HelpWindow.h @@ -55,7 +55,7 @@ private: HelpWindow(GUI::Window* parent = nullptr); JsonObject m_docs; - OutOfProcessWebView* m_webview { nullptr }; + Web::OutOfProcessWebView* m_webview { nullptr }; GUI::ListView* m_listview { nullptr }; }; diff --git a/Demos/WebView/main.cpp b/Demos/WebView/main.cpp index e50b7b7db0..3578a583c0 100644 --- a/Demos/WebView/main.cpp +++ b/Demos/WebView/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char** argv) auto& main_widget = window->set_main_widget(); main_widget.set_fill_with_background_color(true); main_widget.set_layout(); - auto& view = main_widget.add(); + auto& view = main_widget.add(); auto& statusbar = main_widget.add(); window->set_title("WebView"); window->resize(640, 480); diff --git a/Libraries/LibWeb/OutOfProcessWebView.cpp b/Libraries/LibWeb/OutOfProcessWebView.cpp index 53edfd5fec..203dd1605a 100644 --- a/Libraries/LibWeb/OutOfProcessWebView.cpp +++ b/Libraries/LibWeb/OutOfProcessWebView.cpp @@ -32,6 +32,8 @@ #include #include +namespace Web { + OutOfProcessWebView::OutOfProcessWebView() { set_should_hide_unnecessary_scrollbars(true); @@ -194,3 +196,5 @@ WebContentClient& OutOfProcessWebView::client() { return *m_client; } + +} diff --git a/Libraries/LibWeb/OutOfProcessWebView.h b/Libraries/LibWeb/OutOfProcessWebView.h index 506f46cdaa..bdde1f7cff 100644 --- a/Libraries/LibWeb/OutOfProcessWebView.h +++ b/Libraries/LibWeb/OutOfProcessWebView.h @@ -31,6 +31,8 @@ #include #include +namespace Web { + class WebContentClient; class OutOfProcessWebView final @@ -83,3 +85,5 @@ private: RefPtr m_front_bitmap; RefPtr m_back_bitmap; }; + +} diff --git a/Libraries/LibWeb/WebContentClient.cpp b/Libraries/LibWeb/WebContentClient.cpp index 9605070a51..74c2be6959 100644 --- a/Libraries/LibWeb/WebContentClient.cpp +++ b/Libraries/LibWeb/WebContentClient.cpp @@ -28,6 +28,8 @@ #include "OutOfProcessWebView.h" #include +namespace Web { + WebContentClient::WebContentClient(OutOfProcessWebView& view) : IPC::ServerConnection(*this, "/tmp/portal/webcontent") , m_view(view) @@ -139,3 +141,5 @@ void WebContentClient::handle(const Messages::WebContentClient::DidRequestLinkCo { m_view.notify_server_did_request_link_context_menu({}, message.content_position(), message.url(), message.target(), message.modifiers()); } + +} diff --git a/Libraries/LibWeb/WebContentClient.h b/Libraries/LibWeb/WebContentClient.h index d4fd342b01..7357f09375 100644 --- a/Libraries/LibWeb/WebContentClient.h +++ b/Libraries/LibWeb/WebContentClient.h @@ -31,6 +31,8 @@ #include #include +namespace Web { + class OutOfProcessWebView; class WebContentClient @@ -61,3 +63,5 @@ private: OutOfProcessWebView& m_view; }; + +}