Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.19 #3120

Closed
wants to merge 36 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0c70e73
Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.19
mkarolin Jul 24, 2019
7150429
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
136e1fe
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
626b41b
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
e01a9a4
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
2fc72e6
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
0cdc1d1
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
e3aa8cb
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
d2b9de6
.idl files aren't allowed in GN sources.
mkarolin Aug 2, 2019
39124f5
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
d44f660
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
b4c034f
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
9b43132
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
a5b40a3
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
4815dfe
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
1ae164e
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
0029eb0
Signin restructure.
mkarolin Aug 6, 2019
bd8a2d1
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
e1b3b7c
IOThread class has been removed.
mkarolin Aug 6, 2019
6b73802
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
bb83a37
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
3c16cc8
BookmarkNode::set_type was removed.
mkarolin Aug 5, 2019
31d0175
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
0e0f4c8
BookmarkChangeProcessor overrides now use size_t.
mkarolin Aug 6, 2019
a2c56a3
TreeNode::GetChild and child_count were removed.
mkarolin Aug 7, 2019
5fe1e32
Enable networking service.
mkarolin Aug 10, 2019
c7653af
Fixes location change of md_select_css.html.
mkarolin Aug 13, 2019
3cc1f42
Unit tests: Fixes MCSClient API signature changes.
mkarolin Aug 12, 2019
5898235
GridLayout::AddView now takes unique_ptr.
mkarolin Aug 13, 2019
762a6a3
GridLayout c'tor signature change.
mkarolin Aug 13, 2019
96a4bf5
Update strings for 77.0.3865.19.
mkarolin Jul 25, 2019
6ce7fa0
Unit tests: fixes GCMDriver c'tor signature change.
mkarolin Aug 12, 2019
eb8c743
Unit tests: Fixes CreateProfileAsyncHelper signature.
mkarolin Aug 12, 2019
9185b40
TEMPORARY: bookmarks workaround. #2010 Pending.
mkarolin Aug 9, 2019
f3a7ed8
TEMPORARY: network delegate workaround. #2988 Pending.
mkarolin Aug 9, 2019
0bf3cec
TEMPORARY: cookies workaround. #3130 Pending.
mkarolin Aug 10, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

content/public interfaces are no longer const.

Removed const from overrides.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/4b4eed074e848347f5a5b07d4d4b3fd2f6e13820

commit 4b4eed074e848347f5a5b07d4d4b3fd2f6e13820
Author: Lucas Furukawa Gadani <lfg@chromium.org>
Date:   Tue Jun 4 23:12:04 2019 +0000

    Remove const interfaces from content/public.

    Tbr: boliu@chromium.org, dvadym@chromium.org, bengr@chromium.org
    Bug: 908139
  • Loading branch information
mkarolin committed Jul 31, 2019
commit e3aa8cbb6aefd120f37c84b4925c63a6b8fe5b0a
@@ -57,7 +57,7 @@ BraveRewardsSource::BraveRewardsSource(Profile* profile)
BraveRewardsSource::~BraveRewardsSource() {
}

std::string BraveRewardsSource::GetSource() const {
std::string BraveRewardsSource::GetSource() {
return "rewards-image";
}

@@ -112,17 +112,17 @@ void BraveRewardsSource::StartDataRequest(
}
}

std::string BraveRewardsSource::GetMimeType(const std::string&) const {
std::string BraveRewardsSource::GetMimeType(const std::string&) {
// We need to explicitly return a mime type, otherwise if the user tries to
// drag the image they get no extension.
return "image/png";
}

bool BraveRewardsSource::AllowCaching() const {
bool BraveRewardsSource::AllowCaching() {
return false;
}

bool BraveRewardsSource::ShouldReplaceExistingSource() const {
bool BraveRewardsSource::ShouldReplaceExistingSource() {
// Leave the existing DataSource in place, otherwise we'll drop any pending
// requests on the floor.
return false;
@@ -131,7 +131,7 @@ bool BraveRewardsSource::ShouldReplaceExistingSource() const {
bool BraveRewardsSource::ShouldServiceRequest(
const GURL& url,
content::ResourceContext* resource_context,
int render_process_id) const {
int render_process_id) {
return URLDataSource::ShouldServiceRequest(url, resource_context,
render_process_id);
}
@@ -23,18 +23,18 @@ class BraveRewardsSource : public content::URLDataSource {
~BraveRewardsSource() override;

// content::URLDataSource implementation.
std::string GetSource() const override;
std::string GetSource() override;
void StartDataRequest(
const std::string& path,
const content::ResourceRequestInfo::WebContentsGetter& wc_getter,
const content::URLDataSource::GotDataCallback& got_data_callback)
override;
std::string GetMimeType(const std::string&) const override;
bool AllowCaching() const override;
bool ShouldReplaceExistingSource() const override;
std::string GetMimeType(const std::string&) override;
bool AllowCaching() override;
bool ShouldReplaceExistingSource() override;
bool ShouldServiceRequest(const GURL& url,
content::ResourceContext* resource_context,
int render_process_id) const override;
int render_process_id) override;

private:
void OnBitmapFetched(
@@ -111,7 +111,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
} // namespace

WebUI::TypeID BraveWebUIControllerFactory::GetWebUIType(
content::BrowserContext* browser_context, const GURL& url) const {
content::BrowserContext* browser_context, const GURL& url) {
WebUIFactoryFunction function = GetWebUIFactoryFunction(NULL, url);
if (function) {
return reinterpret_cast<WebUI::TypeID>(function);
@@ -120,10 +120,8 @@ WebUI::TypeID BraveWebUIControllerFactory::GetWebUIType(
}

std::unique_ptr<WebUIController>
BraveWebUIControllerFactory::CreateWebUIControllerForURL(
WebUI* web_ui,
const GURL& url) const {

BraveWebUIControllerFactory::CreateWebUIControllerForURL(WebUI* web_ui,
const GURL& url) {
WebUIFactoryFunction function = GetWebUIFactoryFunction(web_ui, url);
if (!function) {
return ChromeWebUIControllerFactory::CreateWebUIControllerForURL(
@@ -14,10 +14,10 @@ class RefCountedMemory;
class BraveWebUIControllerFactory : public ChromeWebUIControllerFactory {
public:
content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context,
const GURL& url) const override;
const GURL& url) override;
std::unique_ptr<content::WebUIController> CreateWebUIControllerForURL(
content::WebUI* web_ui,
const GURL& url) const override;
const GURL& url) override;

static BraveWebUIControllerFactory* GetInstance();

@@ -103,7 +103,7 @@ BraveSharedResourcesDataSource::BraveSharedResourcesDataSource() {
BraveSharedResourcesDataSource::~BraveSharedResourcesDataSource() {
}

std::string BraveSharedResourcesDataSource::GetSource() const {
std::string BraveSharedResourcesDataSource::GetSource() {
return "brave-resources";
}

@@ -123,14 +123,14 @@ void BraveSharedResourcesDataSource::StartDataRequest(
callback.Run(bytes.get());
}

bool BraveSharedResourcesDataSource::AllowCaching() const {
bool BraveSharedResourcesDataSource::AllowCaching() {
// Should not be cached to reflect dynamically-generated contents that may
// depend on the current locale.
return true;
}

std::string BraveSharedResourcesDataSource::GetMimeType(
const std::string& path) const {
const std::string& path) {
if (path.empty())
return "text/html";

@@ -170,20 +170,19 @@ std::string BraveSharedResourcesDataSource::GetMimeType(
return "text/plain";
}

bool BraveSharedResourcesDataSource::ShouldServeMimeTypeAsContentTypeHeader()
const {
bool BraveSharedResourcesDataSource::ShouldServeMimeTypeAsContentTypeHeader() {
return true;
}

scoped_refptr<base::SingleThreadTaskRunner>
BraveSharedResourcesDataSource::TaskRunnerForRequestPath(
const std::string& path) const {
const std::string& path) {
return nullptr;
}

std::string
BraveSharedResourcesDataSource::GetAccessControlAllowOriginForOrigin(
const std::string& origin) const {
const std::string& origin) {
// For now we give access only for "chrome://*" origins.
// According to CORS spec, Access-Control-Allow-Origin header doesn't support
// wildcards, so we need to set its value explicitly by passing the |origin|
@@ -197,7 +196,7 @@ BraveSharedResourcesDataSource::GetAccessControlAllowOriginForOrigin(
return origin;
}

bool BraveSharedResourcesDataSource::IsGzipped(const std::string& path) const {
bool BraveSharedResourcesDataSource::IsGzipped(const std::string& path) {
// Cannot access GetContentClient() from here as that is //content/public
// only. Therefore cannot access ContentClient::IsDataResourceGzipped, so go
// to the bundle directly.
@@ -17,19 +17,19 @@ class BraveSharedResourcesDataSource : public URLDataSource {
~BraveSharedResourcesDataSource() override;

// URLDataSource implementation.
std::string GetSource() const override;
std::string GetSource() override;
void StartDataRequest(
const std::string& path,
const ResourceRequestInfo::WebContentsGetter& wc_getter,
const URLDataSource::GotDataCallback& callback) override;
bool AllowCaching() const override;
std::string GetMimeType(const std::string& path) const override;
bool ShouldServeMimeTypeAsContentTypeHeader() const override;
bool AllowCaching() override;
std::string GetMimeType(const std::string& path) override;
bool ShouldServeMimeTypeAsContentTypeHeader() override;
scoped_refptr<base::SingleThreadTaskRunner> TaskRunnerForRequestPath(
const std::string& path) const override;
const std::string& path) override;
std::string GetAccessControlAllowOriginForOrigin(
const std::string& origin) const override;
bool IsGzipped(const std::string& path) const override;
const std::string& origin) override;
bool IsGzipped(const std::string& path) override;

private:
DISALLOW_COPY_AND_ASSIGN(BraveSharedResourcesDataSource);
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.