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.

Sign up for GitHub

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

Jump to bottom

[C129] [Android] Fix for brave scheme pages #25602

Merged
merged 1 commit into from
Sep 17, 2024
Merged

[C129] [Android] Fix for brave scheme pages #25602

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions chromium_src/components/omnibox/browser/verbatim_match.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright (c) 2024 The Brave Authors. All rights reserved.
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at https://mozilla.org/MPL/2.0/.

#include "components/omnibox/browser/verbatim_match.h"

#include "content/public/common/url_constants.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this include should also be under #if BUILDFLAG(IS_ANDROID), but they didn't do it right upstream, so we can probably just keep it the same for now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it will fail on iOS if we keep it like this, actually, but we can see what CI says.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS passed, as @mkarolin mentioned they don't guard it in the upstream as well, so should be ok for us too

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It passed iOS because of 97aab4f, but we will remove that fix at some point (hopefully, brave/brave-browser#41014) and then we would have to update the override here as well.


#if BUILDFLAG(IS_ANDROID)
#define kChromeUIScheme kChromeUIScheme, content::kBraveUIScheme
#endif // BUILDFLAG(IS_ANDROID)
#include "src/components/omnibox/browser/verbatim_match.cc"
#if BUILDFLAG(IS_ANDROID)
#undef kChromeUIScheme
#endif // BUILDFLAG(IS_ANDROID)
Loading