RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:57:35 +00:00
Code Issues Activity Actions

Browser: Avoid ninja-import of global variable

Browse source
This commit is contained in:
Ben Wiederhake 2020-08-10 22:46:23 +02:00 • committed by Andreas Kling
parent 7893871d5a
commit 84e112be6b
4 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Applications/Browser/Browser.h Normal file
View file

@ -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;
}

3
Applications/Browser/Tab.cpp
View file

@ -26,6 +26,7 @@
#include "Tab.h" #include "Tab.h"
#include "BookmarksBarWidget.h" #include "BookmarksBarWidget.h"
#include "Browser.h"
#include "ConsoleWidget.h" #include "ConsoleWidget.h"
#include "DownloadWidget.h" #include "DownloadWidget.h"
#include "InspectorWidget.h" #include "InspectorWidget.h"
@ -60,8 +61,6 @@
namespace Browser { namespace Browser {
extern String g_home_url;
URL url_from_user_input(const String& input) URL url_from_user_input(const String& input)
{ {
auto url = URL(input); auto url = URL(input);

2
Applications/Browser/Tab.h
View file

@ -111,4 +111,6 @@ private:
RefPtr<const Gfx::Bitmap> m_icon; RefPtr<const Gfx::Bitmap> m_icon;
}; };
URL url_from_user_input(const String& input);
} }

2
Applications/Browser/main.cpp
View file

@ -25,6 +25,7 @@
*/ */
#include "BookmarksBarWidget.h" #include "BookmarksBarWidget.h"
#include "Browser.h"
#include "InspectorWidget.h" #include "InspectorWidget.h"
#include "Tab.h" #include "Tab.h"
#include "WindowActions.h" #include "WindowActions.h"
@ -46,7 +47,6 @@
namespace Browser { namespace Browser {
String g_home_url; String g_home_url;
URL url_from_user_input(const String& input);
bool g_multi_process = false; bool g_multi_process = false;
static String bookmarks_file_path() static String bookmarks_file_path()