Implement "Desktop Welcome Pages" feature #23289
+1,704
−3
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // 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 "brave/browser/ui/webui/brave_education/brave_education_ui.h" | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "brave/browser/ui/webui/brave_education/education_page_handler.h" | ||
| #include "brave/browser/ui/webui/brave_webui_source.h" | ||
| #include "brave/browser/ui/webui/browser_command/brave_browser_command_handler.h" | ||
| #include "brave/components/brave_education/common/education_content_urls.h" | ||
| #include "brave/components/brave_education/resources/grit/brave_education_generated_map.h" | ||
| #include "chrome/browser/profiles/profile.h" | ||
| #include "chrome/browser/ui/webui/webui_util.h" | ||
| #include "chrome/grit/branded_strings.h" | ||
| #include "components/grit/brave_components_resources.h" | ||
| #include "content/public/browser/web_contents.h" | ||
| #include "content/public/browser/web_ui.h" | ||
| #include "content/public/browser/web_ui_data_source.h" | ||
| #include "services/network/public/mojom/content_security_policy.mojom.h" | ||
| #include "ui/base/webui/web_ui_util.h" | ||
|
|
||
| namespace brave_education { | ||
|
|
||
| namespace { | ||
|
|
||
| std::vector<browser_command::mojom::Command> GetSupportedCommands( | ||
| const GURL& webui_url) { | ||
| using browser_command::mojom::Command; | ||
|
|
||
| auto content_type = EducationContentTypeFromBrowserURL(webui_url.spec()); | ||
| if (!content_type) { | ||
| return {}; | ||
| } | ||
|
|
||
| switch (*content_type) { | ||
| case EducationContentType::kGettingStarted: | ||
| return {Command::kOpenRewardsOnboarding, Command::kOpenWalletOnboarding, | ||
| Command::kOpenVPNOnboarding, Command::kOpenAIChat}; | ||
| } | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| BraveEducationUI::BraveEducationUI(content::WebUI* web_ui, | ||
| const std::string& host_name) | ||
| : ui::MojoWebUIController(web_ui) { | ||
| content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd( | ||
| Profile::FromWebUI(web_ui), host_name); | ||
|
|
||
| webui::SetupWebUIDataSource( | ||
| source, | ||
| base::make_span(kBraveEducationGenerated, kBraveEducationGeneratedSize), | ||
| IDR_BRAVE_EDUCATION_HTML); | ||
|
|
||
| AddBackgroundColorToSource(source, web_ui->GetWebContents()); | ||
|
|
||
| static constexpr webui::LocalizedString kStrings[] = { | ||
| {"headerText", IDS_WELCOME_HEADER}}; | ||
| source->AddLocalizedStrings(kStrings); | ||
|
|
||
| // Allow embedding of iframe from brave.com. | ||
| source->OverrideContentSecurityPolicy( | ||
| network::mojom::CSPDirectiveName::ChildSrc, | ||
| "child-src chrome://webui-test https://brave.com/;"); | ||
| } | ||
|
|
||
| BraveEducationUI::~BraveEducationUI() = default; | ||
|
|
||
| void BraveEducationUI::BindInterface( | ||
| mojo::PendingReceiver<EducationPageHandlerFactory> pending_receiver) { | ||
| if (page_factory_receiver_.is_bound()) { | ||
| page_factory_receiver_.reset(); | ||
| } | ||
| page_factory_receiver_.Bind(std::move(pending_receiver)); | ||
| } | ||
|
|
||
| void BraveEducationUI::BindInterface( | ||
| mojo::PendingReceiver<CommandHandlerFactory> pending_receiver) { | ||
| if (command_handler_factory_receiver_.is_bound()) { | ||
| command_handler_factory_receiver_.reset(); | ||
| } | ||
| command_handler_factory_receiver_.Bind(std::move(pending_receiver)); | ||
| } | ||
|
|
||
| void BraveEducationUI::CreatePageHandler( | ||
| mojo::PendingReceiver<mojom::EducationPageHandler> handler) { | ||
| page_handler_ = std::make_unique<EducationPageHandler>(std::move(handler)); | ||
| } | ||
|
|
||
| void BraveEducationUI::CreateBrowserCommandHandler( | ||
| mojo::PendingReceiver<browser_command::mojom::CommandHandler> | ||
| pending_handler) { | ||
| command_handler_ = std::make_unique<BraveBrowserCommandHandler>( | ||
| std::move(pending_handler), Profile::FromWebUI(web_ui()), | ||
| GetSupportedCommands(web_ui()->GetWebContents()->GetVisibleURL())); | ||
| } | ||
|
|
||
| WEB_UI_CONTROLLER_TYPE_IMPL(BraveEducationUI) | ||
|
|
||
| } // namespace brave_education |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // 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/. | ||
|
|
||
| #ifndef BRAVE_BROWSER_UI_WEBUI_BRAVE_EDUCATION_BRAVE_EDUCATION_UI_H_ | ||
| #define BRAVE_BROWSER_UI_WEBUI_BRAVE_EDUCATION_BRAVE_EDUCATION_UI_H_ | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
|
|
||
| #include "base/memory/raw_ptr.h" | ||
| #include "brave/components/brave_education/common/education_page.mojom.h" | ||
| #include "mojo/public/cpp/bindings/pending_receiver.h" | ||
| #include "mojo/public/cpp/bindings/pending_remote.h" | ||
| #include "mojo/public/cpp/bindings/receiver.h" | ||
| #include "ui/webui/mojo_web_ui_controller.h" | ||
| #include "ui/webui/resources/js/browser_command/browser_command.mojom.h" | ||
|
|
||
| namespace content { | ||
| class WebUI; | ||
| } | ||
|
|
||
| namespace brave_education { | ||
|
|
||
| // The Web UI controller for the Brave product education page, which displays | ||
| // production education website content in an iframe. | ||
| class BraveEducationUI : public ui::MojoWebUIController, | ||
| public mojom::EducationPageHandlerFactory, | ||
| public browser_command::mojom::CommandHandlerFactory { | ||
| public: | ||
| BraveEducationUI(content::WebUI* web_ui, const std::string& host_name); | ||
| ~BraveEducationUI() override; | ||
|
|
||
| BraveEducationUI(const BraveEducationUI&) = delete; | ||
| BraveEducationUI& operator=(const BraveEducationUI&) = delete; | ||
|
|
||
| void BindInterface( | ||
| mojo::PendingReceiver<EducationPageHandlerFactory> pending_receiver); | ||
|
|
||
| void BindInterface( | ||
| mojo::PendingReceiver<CommandHandlerFactory> pending_receiver); | ||
|
|
||
| // mojom::EducationPageHandlerFactory: | ||
| void CreatePageHandler( | ||
| mojo::PendingReceiver<mojom::EducationPageHandler> handler) override; | ||
|
|
||
| // browser_command::mojom::CommandHandlerFactory: | ||
| void CreateBrowserCommandHandler( | ||
| mojo::PendingReceiver<browser_command::mojom::CommandHandler> handler) | ||
| override; | ||
|
|
||
| private: | ||
| mojo::Receiver<EducationPageHandlerFactory> page_factory_receiver_{this}; | ||
| mojo::Receiver<CommandHandlerFactory> command_handler_factory_receiver_{this}; | ||
| std::unique_ptr<mojom::EducationPageHandler> page_handler_; | ||
| std::unique_ptr<browser_command::mojom::CommandHandler> command_handler_; | ||
|
|
||
| WEB_UI_CONTROLLER_TYPE_DECL(); | ||
| }; | ||
|
|
||
| } // namespace brave_education | ||
|
|
||
| #endif // BRAVE_BROWSER_UI_WEBUI_BRAVE_EDUCATION_BRAVE_EDUCATION_UI_H_ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this behind a !IS_ANDROID flag?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not meant to be available on Android. I'm not sure that it can be built on Android in any case since
browser_command_handler.ccis not built on Android.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's not really an appropriate use of an os buildflag. If the entire feature is not available on android then it should have its own buildflag with
= !is_android. OS buildflags should be reserved for os-specific code and also the feature flag itself is not behind any buildflag so this doesn't really make sense here as-is.