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

WIP: Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.35 #3180

Closed
wants to merge 51 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
423a083
Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.35
mkarolin Jul 24, 2019
bd9ec36
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
d3f7753
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
1ab6a1a
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
94ca89d
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
62db6f1
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
fcad3da
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
c288e60
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
e9d0417
Removed unused source_set from the build.
mkarolin Aug 2, 2019
51e9a45
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
04a52ec
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
7356b53
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
001d02b
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
a85619c
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
28afa6d
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
780ef50
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
41b5d1f
Signin restructure.
mkarolin Aug 6, 2019
ac771a5
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
5ab6339
IOThread class has been removed.
mkarolin Aug 6, 2019
6cb9e48
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
b7f5923
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
47fbab7
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
35fce2e
Enable networking service.
mkarolin Aug 10, 2019
58c6807
Fixes location change of md_select_css.html.
mkarolin Aug 13, 2019
fdae8cf
GridLayout::AddView now takes unique_ptr.
mkarolin Aug 13, 2019
53b5099
GridLayout c'tor signature change.
mkarolin Aug 13, 2019
672cf89
Signature change in WillCreateURLLoaderFactory in
mkarolin Aug 14, 2019
f4050a9
Removed BraveNetworkDelegateBase and subclasses.
mkarolin Aug 14, 2019
e1d5146
Removed AllowGetCookie/AllowSetCookie from BraveContentBrowserClient.
mkarolin Aug 16, 2019
cccb7d4
StringDataSource replaced StringDataPipeProducer.
mkarolin Aug 15, 2019
abbd577
Fixes Chromium bluetooth UUID dependency bug.
mkarolin Aug 17, 2019
cda6703
TreeNode::GetChild and child_count were removed.
mkarolin Aug 20, 2019
ff7751d
syncer::Cryptographer c'tor signature change.
mkarolin Aug 20, 2019
fe976d2
Added a missing header include.
mkarolin Aug 20, 2019
37232ce
paper-button has been replaced with cr-button.
mkarolin Aug 19, 2019
5bc7db7
Fixes missing pref in Shields settings radio buttons.
mkarolin Aug 20, 2019
024cef0
Transition CSS from [dark] to @media.
mkarolin Aug 20, 2019
9625fa3
Unit tests: Fixes MCSClient API signature changes.
mkarolin Aug 12, 2019
8fc861a
Unit tests: fixes GCMDriver c'tor signature change.
mkarolin Aug 12, 2019
54d16c0
Unit tests: Fixes CreateProfileAsyncHelper signature.
mkarolin Aug 12, 2019
c85d11c
Unit test: BraveSyncServiceTest.GetDisableReasons fix.
mkarolin Aug 21, 2019
54b356e
Browser Test: SendToOmniboxAndSubmit signature change.
mkarolin Aug 21, 2019
42fe586
Browser Test: added missing overrides to BraveMockRenderViewContextMenu.
mkarolin Aug 21, 2019
49d495f
Browser Test: Removed SetUrlRequestMocksEnabled.
mkarolin Aug 21, 2019
1c405a2
Browser Test: Added a missing header include.
mkarolin Aug 21, 2019
884a909
Browser Test: Rename ContextualSuggestionsService => RemoteSuggestion…
mkarolin Aug 21, 2019
2fe7418
Browser Test: clean up disabled features.
mkarolin Aug 22, 2019
8dd6ea2
Moved starting of Brave services to PostBrowserStart.
mkarolin Aug 22, 2019
bfe3812
Browser Test: Allow intentional crash.
mkarolin Aug 22, 2019
67605b2
Update strings for 77.0.3865.19.
mkarolin Jul 25, 2019
8a0679d
TEMPORARY: commented out code affected by Chromium commit 6811de35a39…
mkarolin Aug 16, 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 c288e6002563def8cf85ed7e0d6cb7bebeaa1217
@@ -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(
@@ -120,7 +120,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);
@@ -129,10 +129,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.