diff --git a/.storybook/BUILD.gn b/.storybook/BUILD.gn index a24cc306454..6ea66caa378 100644 --- a/.storybook/BUILD.gn +++ b/.storybook/BUILD.gn @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # you can obtain one at http://mozilla.org/MPL/2.0/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/speedreader/common/buildflags/buildflags.gni") @@ -15,6 +14,7 @@ group("storybook") { # are disabled in a regular brave build due to build flags, # they will be generated before storybook is compiled. deps = [ + "//brave/components/ai_chat/core/common/mojom:mojom_js", "//brave/components/brave_new_tab_ui:mojom_js", "//brave/components/brave_news/common:mojom_js", "//brave/components/brave_rewards/common/mojom:mojom_js", @@ -28,12 +28,4 @@ group("storybook") { if (enable_speedreader) { deps += [ "//brave/components/speedreader/common:mojom_js" ] } - - # TODO(petemill): Make sure enable_ai_chat is enabled for storybook builds, - # possibly with an is_storybook buildflag. - # This only works correctly because enable_ai_chat happens to be enabled - # for all desktop platfroms. - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common/mojom:mojom_js" ] - } } diff --git a/android/BUILD.gn b/android/BUILD.gn index 117250e0256..1d7fe79187d 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/p3a/buildflags.gni") import("//brave/components/webcompat_reporter/buildflags/buildflags.gni") import("//build/config/android/rules.gni") @@ -25,6 +24,5 @@ java_cpp_template("brave_config_java") { "BRAVE_ANDROID_DEVELOPER_OPTIONS_CODE=\"$brave_android_developer_options_code\"", "BRAVE_ANDROID_P3A_ENABLED=$brave_p3a_enabled", "BRAVE_ANDROID_WEBCOMPAT_REPORT_ENDPOINT=\"$webcompat_report_api_endpoint\"", - "BRAVE_ANDROID_AI_CHAT_ENABLED=$enable_ai_chat", ] } diff --git a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPrefUtils.java b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPrefUtils.java index ad09918f287..dc1f6bd9587 100644 --- a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPrefUtils.java +++ b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoPrefUtils.java @@ -8,7 +8,6 @@ package org.chromium.chrome.browser.brave_leo; import org.chromium.base.BraveFeatureList; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.chrome.browser.BraveConfig; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.preferences.BravePref; @@ -117,8 +116,7 @@ public class BraveLeoPrefUtils { } public static boolean isLeoEnabled() { - if (!BraveConfig.AI_CHAT_ENABLED - || !ChromeFeatureList.isEnabled(BraveFeatureList.AI_CHAT)) { + if (!ChromeFeatureList.isEnabled(BraveFeatureList.AI_CHAT)) { return false; } diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java index 13c21a22f35..9741d6003ae 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -13,7 +13,6 @@ import androidx.annotation.Nullable; import org.chromium.base.Callback; import org.chromium.base.supplier.Supplier; -import org.chromium.chrome.browser.BraveConfig; import org.chromium.chrome.browser.brave_leo.BraveLeoPrefUtils; import org.chromium.chrome.browser.brave_leo.BraveLeoUtils; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; @@ -121,10 +120,8 @@ class BraveAutocompleteMediator extends AutocompleteMediator if (mDropdownViewInfoListBuilder instanceof BraveDropdownItemViewInfoListBuilder) { ((BraveDropdownItemViewInfoListBuilder) mDropdownViewInfoListBuilder) .setAutocompleteDelegate(mDelegate); - if (BraveConfig.AI_CHAT_ENABLED) { - ((BraveDropdownItemViewInfoListBuilder) mDropdownViewInfoListBuilder) - .setLeoAutocompleteDelegate(this); - } + ((BraveDropdownItemViewInfoListBuilder) mDropdownViewInfoListBuilder) + .setLeoAutocompleteDelegate(this); } super.initDefaultProcessors(); } diff --git a/app/theme/BUILD.gn b/app/theme/BUILD.gn index 963d80f002a..fc6a0f0d59b 100644 --- a/app/theme/BUILD.gn +++ b/app/theme/BUILD.gn @@ -12,10 +12,7 @@ assert(!is_android) brave_grit("brave_theme_resources") { source = "brave_theme_resources.grd" defines = chrome_grit_defines - defines += [ - "enable_ai_chat=$enable_ai_chat", - "enable_playlist_webui=$enable_playlist_webui", - ] + defines += [ "enable_playlist_webui=$enable_playlist_webui" ] outputs = [ "grit/brave_theme_resources.h", "grit/brave_theme_resources_map.cc", diff --git a/app/theme/brave_theme_resources.grd b/app/theme/brave_theme_resources.grd index 199df2c7b69..c90f08fb9c2 100644 --- a/app/theme/brave_theme_resources.grd +++ b/app/theme/brave_theme_resources.grd @@ -28,9 +28,7 @@ - - - + diff --git a/browser/about_flags.cc b/browser/about_flags.cc index 207582ab5e8..09fa0f7aeeb 100644 --- a/browser/about_flags.cc +++ b/browser/about_flags.cc @@ -14,7 +14,7 @@ #include "brave/browser/ethereum_remote_client/features.h" #include "brave/browser/ui/brave_ui_features.h" #include "brave/browser/ui/tabs/features.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/ai_rewriter/common/buildflags/buildflags.h" #include "brave/components/brave_ads/browser/ad_units/notification_ad/custom_notification_ad_feature.h" #include "brave/components/brave_ads/core/public/ad_units/notification_ad/notification_ad_feature.h" @@ -48,10 +48,6 @@ #include "net/base/features.h" #include "third_party/blink/public/common/features.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif - #if BUILDFLAG(ENABLE_AI_REWRITER) #include "brave/components/ai_rewriter/common/features.h" #endif @@ -360,7 +356,6 @@ #define BRAVE_MIDDLE_CLICK_AUTOSCROLL_FEATURE_ENTRY #endif -#if BUILDFLAG(ENABLE_AI_CHAT) #define BRAVE_AI_CHAT_FEATURE_ENTRIES \ EXPAND_FEATURE_ENTRIES( \ { \ @@ -400,9 +395,7 @@ kOsDesktop | kOsAndroid, \ FEATURE_VALUE_TYPE(ai_chat::features::kOpenAIChatFromBraveSearch), \ }) -#else -#define BRAVE_AI_CHAT_FEATURE_ENTRIES -#endif + #if BUILDFLAG(ENABLE_AI_REWRITER) #define BRAVE_AI_REWRITER \ EXPAND_FEATURE_ENTRIES({ \ diff --git a/browser/ai_chat/BUILD.gn b/browser/ai_chat/BUILD.gn index 219a13500fb..d6cfffee0c9 100644 --- a/browser/ai_chat/BUILD.gn +++ b/browser/ai_chat/BUILD.gn @@ -3,11 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//printing/buildflags/buildflags.gni") -assert(enable_ai_chat) - static_library("ai_chat") { sources = [ "ai_chat_service_factory.cc", diff --git a/browser/ai_chat/android/ai_chat_utils_android.cc b/browser/ai_chat/android/ai_chat_utils_android.cc index 6d6cc4f4e6b..03ded3c5b2f 100644 --- a/browser/ai_chat/android/ai_chat_utils_android.cc +++ b/browser/ai_chat/android/ai_chat_utils_android.cc @@ -6,17 +6,13 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/time/time.h" -#include "brave/build/android/jni_headers/BraveLeoUtils_jni.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" - -#if BUILDFLAG(ENABLE_AI_CHAT) #include "brave/browser/ai_chat/ai_chat_service_factory.h" +#include "brave/build/android/jni_headers/BraveLeoUtils_jni.h" #include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" #include "brave/components/ai_chat/core/browser/ai_chat_service.h" #include "brave/components/ai_chat/core/browser/conversation_handler.h" #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "content/public/browser/web_contents.h" -#endif namespace ai_chat { @@ -25,7 +21,6 @@ static void JNI_BraveLeoUtils_OpenLeoQuery( const base::android::JavaParamRef& jweb_contents, const base::android::JavaParamRef& conversation_uuid, const base::android::JavaParamRef& query) { -#if BUILDFLAG(ENABLE_AI_CHAT) content::WebContents* web_contents = content::WebContents::FromJavaWebContents(jweb_contents); AIChatService* ai_chat_service = AIChatServiceFactory::GetForBrowserContext( @@ -56,6 +51,5 @@ static void JNI_BraveLeoUtils_OpenLeoQuery( base::android::ConvertJavaStringToUTF8(query), std::nullopt, std::nullopt, base::Time::Now(), std::nullopt, false); conversation->SubmitHumanConversationEntry(std::move(turn)); -#endif } } // namespace ai_chat diff --git a/browser/android/background_video/BUILD.gn b/browser/android/background_video/BUILD.gn index 7d04a3e09ed..6dfba1a4755 100644 --- a/browser/android/background_video/BUILD.gn +++ b/browser/android/background_video/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//build/config/android/rules.gni") source_set("background_video") { diff --git a/browser/android/preferences/BUILD.gn b/browser/android/preferences/BUILD.gn index 8c2e03b5987..e6f04c6c93a 100644 --- a/browser/android/preferences/BUILD.gn +++ b/browser/android/preferences/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//build/config/android/rules.gni") source_set("preferences") { @@ -35,6 +34,7 @@ source_set("preferences") { java_cpp_strings("java_pref_names_srcjar") { sources = [ + "//brave/components/ai_chat/core/common/pref_names.h", "//brave/components/brave_adaptive_captcha/pref_names.h", "//brave/components/brave_rewards/common/pref_names.h", "//brave/components/brave_shields/core/common/pref_names.h", @@ -54,10 +54,6 @@ java_cpp_strings("java_pref_names_srcjar") { "//components/translate/core/browser/translate_pref_names.h", ] - if (enable_ai_chat) { - sources += [ "//brave/components/ai_chat/core/common/pref_names.h" ] - } - template = "//brave/browser/preferences/android/java_templates/BravePref.java.tmpl" } diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 02c5a592a29..cab7d23a667 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -16,6 +16,7 @@ #include "base/json/json_reader.h" #include "base/strings/strcat.h" #include "base/system/sys_info.h" +#include "brave/browser/ai_chat/ai_chat_service_factory.h" #include "brave/browser/brave_ads/ads_service_factory.h" #include "brave/browser/brave_browser_features.h" #include "brave/browser/brave_browser_main_extra_parts.h" @@ -36,10 +37,18 @@ #include "brave/browser/profiles/brave_renderer_updater_factory.h" #include "brave/browser/skus/skus_service_factory.h" #include "brave/browser/ui/brave_ui_features.h" +#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" #include "brave/browser/ui/webui/brave_rewards/rewards_page_ui.h" #include "brave/browser/ui/webui/skus_internals_ui.h" #include "brave/browser/url_sanitizer/url_sanitizer_service_factory.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/content/browser/ai_chat_brave_search_throttle.h" +#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" +#include "brave/components/ai_chat/content/browser/ai_chat_throttle.h" +#include "brave/components/ai_chat/core/browser/utils.h" +#include "brave/components/ai_chat/core/common/features.h" +#include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" +#include "brave/components/ai_chat/core/common/mojom/page_content_extractor.mojom.h" +#include "brave/components/ai_chat/core/common/mojom/settings_helper.mojom.h" #include "brave/components/ai_rewriter/common/buildflags/buildflags.h" #include "brave/components/body_sniffer/body_sniffer_throttle.h" #include "brave/components/brave_federated/features.h" @@ -155,24 +164,12 @@ using content::WebContents; using extensions::ChromeContentBrowserClientExtensionsPart; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ai_chat/ai_chat_service_factory.h" -#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" -#include "brave/components/ai_chat/content/browser/ai_chat_brave_search_throttle.h" -#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" -#include "brave/components/ai_chat/content/browser/ai_chat_throttle.h" -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/features.h" -#include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" -#include "brave/components/ai_chat/core/common/mojom/page_content_extractor.mojom.h" -#include "brave/components/ai_chat/core/common/mojom/settings_helper.mojom.h" #if !BUILDFLAG(IS_ANDROID) #include "brave/browser/ui/ai_chat/utils.h" #endif #if BUILDFLAG(IS_ANDROID) #include "brave/components/ai_chat/core/browser/android/ai_chat_iap_subscription_android.h" #endif -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) #include "brave/browser/ui/webui/ai_rewriter/ai_rewriter_ui.h" @@ -574,7 +571,6 @@ void BraveContentBrowserClient:: &render_frame_host)); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) // AI Chat page content extraction renderer -> browser interface associated_registry.AddInterface( base::BindRepeating( @@ -585,7 +581,6 @@ void BraveContentBrowserClient:: render_frame_host, std::move(receiver)); }, &render_frame_host)); -#endif #if BUILDFLAG(ENABLE_PLAYLIST) associated_registry.AddInterface( @@ -621,13 +616,11 @@ void BraveContentBrowserClient::RegisterWebUIInterfaceBrokers( } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat::features::IsAIChatEnabled()) { registry.ForWebUI() .Add() .Add(); } -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) if (ai_rewriter::features::IsAIRewriterEnabled()) { @@ -833,7 +826,6 @@ void BraveContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) auto* prefs = user_prefs::UserPrefs::Get(render_frame_host->GetBrowserContext()); if (ai_chat::IsAIChatEnabled(prefs) && @@ -853,7 +845,6 @@ void BraveContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( base::BindRepeating(&BindIAPSubscription)); } #endif -#endif #if BUILDFLAG(ENABLE_SPEEDREADER) && !BUILDFLAG(IS_ANDROID) content::RegisterWebUIControllerInterfaceBinder< @@ -1266,7 +1257,6 @@ BraveContentBrowserClient::CreateThrottlesForNavigation( } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) if (Profile::FromBrowserContext(context)->IsRegularProfile()) { if (auto ai_chat_throttle = ai_chat::AiChatThrottle::MaybeCreateThrottleFor(handle)) { @@ -1283,7 +1273,6 @@ BraveContentBrowserClient::CreateThrottlesForNavigation( throttles.push_back(std::move(ai_chat_brave_search_throttle)); } #endif -#endif // ENABLE_AI_CHAT return throttles; } diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc index d152bf324b8..d8dc3b39a3e 100644 --- a/browser/brave_local_state_prefs.cc +++ b/browser/brave_local_state_prefs.cc @@ -18,7 +18,7 @@ #include "brave/browser/playlist/playlist_service_factory.h" #include "brave/browser/search_engines/search_engine_tracker.h" #include "brave/browser/themes/brave_dark_mode_utils.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_referrals/browser/brave_referrals_service.h" #include "brave/components/brave_search_conversion/p3a.h" #include "brave/components/brave_shields/content/browser/ad_block_service.h" @@ -69,10 +69,6 @@ #include "brave/components/brave_vpn/common/brave_vpn_utils.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if BUILDFLAG(ENABLE_WIDEVINE) #include "brave/browser/widevine/widevine_utils.h" #endif @@ -155,13 +151,9 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { brave_vpn::RegisterLocalStatePrefs(registry); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::prefs::RegisterLocalStatePrefs(registry); -#endif -#if BUILDFLAG(ENABLE_BRAVE_VPN) || BUILDFLAG(ENABLE_AI_CHAT) skus::RegisterLocalStatePrefs(registry); -#endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) DayZeroBrowserUIExptManager::RegisterLocalStatePrefs(registry); diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 7b802c717a7..3a7b2d10501 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -15,7 +15,9 @@ #include "brave/browser/translate/brave_translate_prefs_migration.h" #include "brave/browser/ui/bookmark/brave_bookmark_prefs.h" #include "brave/browser/ui/omnibox/brave_omnibox_client_impl.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/model_service.h" +#include "brave/components/ai_chat/core/common/features.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_adaptive_captcha/brave_adaptive_captcha_service.h" #include "brave/components/brave_ads/browser/analytics/p2a/p2a.h" #include "brave/components/brave_ads/core/public/prefs/obsolete_pref_util.h" @@ -112,12 +114,6 @@ #include "chrome/browser/ui/webui/side_panel/bookmarks/bookmarks.mojom.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/model_service.h" -#include "brave/components/ai_chat/core/common/features.h" -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if BUILDFLAG(ENABLE_REQUEST_OTR) #include "brave/components/request_otr/browser/request_otr_service.h" #endif @@ -207,9 +203,8 @@ void RegisterProfilePrefsForMigration( brave_ads::RegisterProfilePrefsForMigration(registry); // Added 2024-04 -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::prefs::RegisterProfilePrefsForMigration(registry); -#endif + brave_shields::RegisterShieldsP3AProfilePrefsForMigration(registry); // Added 2024-05 @@ -465,10 +460,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { base::Value(static_cast(side_panel::mojom::ViewType::kCompact))); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::prefs::RegisterProfilePrefs(registry); ai_chat::ModelService::RegisterProfilePrefs(registry); -#endif brave_search_conversion::RegisterPrefs(registry); diff --git a/browser/brave_tab_helpers.cc b/browser/brave_tab_helpers.cc index face0640def..edcc699d4bf 100644 --- a/browser/brave_tab_helpers.cc +++ b/browser/brave_tab_helpers.cc @@ -9,6 +9,9 @@ #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" +#include "brave/browser/ai_chat/ai_chat_service_factory.h" +#include "brave/browser/ai_chat/ai_chat_utils.h" #include "brave/browser/brave_ads/creatives/search_result_ad/creative_search_result_ad_tab_helper.h" #include "brave/browser/brave_ads/tabs/ads_tab_helper.h" #include "brave/browser/brave_browser_process.h" @@ -22,7 +25,7 @@ #include "brave/browser/ntp_background/ntp_tab_helper.h" #include "brave/browser/ui/bookmark/brave_bookmark_tab_helper.h" #include "brave/browser/ui/brave_ui_features.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" #include "brave/components/brave_perf_predictor/browser/perf_predictor_tab_helper.h" #include "brave/components/brave_wayback_machine/buildflags/buildflags.h" #include "brave/components/greaselion/browser/buildflags/buildflags.h" @@ -61,15 +64,9 @@ #include "brave/browser/new_tab/background_color_tab_helper.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "brave/browser/ui/ai_chat/print_preview_extractor.h" #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) -#include "base/functional/callback_helpers.h" -#include "brave/browser/ai_chat/ai_chat_service_factory.h" -#include "brave/browser/ai_chat/ai_chat_utils.h" -#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(ENABLE_WIDEVINE) #include "brave/browser/brave_drm_tab_helper.h" @@ -134,7 +131,6 @@ void AttachTabHelpers(content::WebContents* web_contents) { brave_rewards::RewardsTabHelper::CreateForWebContents(web_contents); -#if BUILDFLAG(ENABLE_AI_CHAT) content::BrowserContext* context = web_contents->GetBrowserContext(); if (ai_chat::IsAllowedForContext(context)) { ai_chat::AIChatTabHelper::CreateForWebContents( @@ -146,7 +142,6 @@ void AttachTabHelpers(content::WebContents* web_contents) { #endif ); } -#endif #if BUILDFLAG(ENABLE_WIDEVINE) BraveDrmTabHelper::CreateForWebContents(web_contents); diff --git a/browser/browser_context_keyed_service_factories.cc b/browser/browser_context_keyed_service_factories.cc index 639d6f2d9f1..63af645c816 100644 --- a/browser/browser_context_keyed_service_factories.cc +++ b/browser/browser_context_keyed_service_factories.cc @@ -6,6 +6,7 @@ #include "brave/browser/browser_context_keyed_service_factories.h" #include "base/feature_list.h" +#include "brave/browser/ai_chat/ai_chat_service_factory.h" #include "brave/browser/brave_adaptive_captcha/brave_adaptive_captcha_service_factory.h" #include "brave/browser/brave_ads/ads_service_factory.h" #include "brave/browser/brave_federated/brave_federated_service_factory.h" @@ -29,10 +30,11 @@ #include "brave/browser/profiles/brave_renderer_updater_factory.h" #include "brave/browser/search_engines/search_engine_provider_service_factory.h" #include "brave/browser/search_engines/search_engine_tracker.h" +#include "brave/browser/skus/skus_service_factory.h" #include "brave/browser/sync/brave_sync_alerts_service_factory.h" #include "brave/browser/url_sanitizer/url_sanitizer_service_factory.h" #include "brave/browser/webcompat_reporter/webcompat_reporter_service_factory.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/content/browser/model_service_factory.h" #include "brave/components/brave_perf_predictor/browser/named_third_party_registry_factory.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/common/common_utils.h" @@ -47,10 +49,6 @@ #include "brave/browser/brave_vpn/brave_vpn_service_factory.h" #endif -#if BUILDFLAG(ENABLE_BRAVE_VPN) || BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/skus/skus_service_factory.h" -#endif - #if BUILDFLAG(ENABLE_GREASELION) #include "brave/browser/greaselion/greaselion_service_factory.h" #endif @@ -97,11 +95,6 @@ #include "brave/browser/request_otr/request_otr_service_factory.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ai_chat/ai_chat_service_factory.h" -#include "brave/components/ai_chat/content/browser/model_service_factory.h" -#endif - namespace brave { void EnsureBrowserContextKeyedServiceFactoriesBuilt() { @@ -166,9 +159,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { EphemeralStorageServiceFactory::GetInstance(); PermissionLifetimeManagerFactory::GetInstance(); -#if BUILDFLAG(ENABLE_BRAVE_VPN) || BUILDFLAG(ENABLE_AI_CHAT) skus::SkusServiceFactory::GetInstance(); -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) brave_vpn::BraveVpnServiceFactory::GetInstance(); #endif @@ -196,10 +187,9 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { #if BUILDFLAG(ENABLE_SPEEDREADER) speedreader::SpeedreaderServiceFactory::GetInstance(); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) + ai_chat::AIChatServiceFactory::GetInstance(); ai_chat::ModelServiceFactory::GetInstance(); -#endif } } // namespace brave diff --git a/browser/browsing_data/BUILD.gn b/browser/browsing_data/BUILD.gn index 627e0d0b579..c2e75880141 100644 --- a/browser/browsing_data/BUILD.gn +++ b/browser/browsing_data/BUILD.gn @@ -17,7 +17,6 @@ source_set("browser_tests") { deps = [ "//base", "//base/test:test_support", - "//brave/components/ai_chat/core/common/buildflags:buildflags", "//chrome/app:command_ids", "//chrome/browser", "//chrome/browser/browsing_data:constants", diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.cc b/browser/browsing_data/brave_browsing_data_remover_delegate.cc index 456bd0bee7d..d96808085fe 100644 --- a/browser/browsing_data/brave_browsing_data_remover_delegate.cc +++ b/browser/browsing_data/brave_browsing_data_remover_delegate.cc @@ -9,6 +9,8 @@ #include #include "brave/browser/brave_news/brave_news_controller_factory.h" +#include "brave/components/ai_chat/core/browser/utils.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_news/browser/brave_news_controller.h" #include "brave/components/content_settings/core/browser/brave_content_settings_pref_provider.h" #include "brave/components/content_settings/core/browser/brave_content_settings_utils.h" @@ -19,11 +21,6 @@ #include "chrome/common/buildflags.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/features.h" -#endif - BraveBrowsingDataRemoverDelegate::BraveBrowsingDataRemoverDelegate( content::BrowserContext* browser_context) : ChromeBrowsingDataRemoverDelegate(browser_context), @@ -38,20 +35,18 @@ void BraveBrowsingDataRemoverDelegate::RemoveEmbedderData( content::BrowsingDataFilterBuilder* filter_builder, uint64_t origin_type_mask, base::OnceCallback callback) { - ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(delete_begin, - delete_end, - remove_mask, - filter_builder, - origin_type_mask, - std::move(callback)); + ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( + delete_begin, delete_end, remove_mask, filter_builder, origin_type_mask, + std::move(callback)); // We do this because ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData() // doesn't clear shields settings with non all time range. // The reason is upstream assumes that plugins type only as empty string // resource ids with plugins type. but we use plugins type to store our // shields settings with non-empty resource ids. - if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS) + if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS) { ClearShieldsSettings(delete_begin, delete_end); + } // Brave News feed cache if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_HISTORY) { @@ -61,13 +56,12 @@ void BraveBrowsingDataRemoverDelegate::RemoveEmbedderData( brave_news_controller->ClearHistory(); } } -#if BUILDFLAG(ENABLE_AI_CHAT) + if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY && ai_chat::IsAIChatEnabled(profile_->GetPrefs()) && ai_chat::features::IsAIChatHistoryEnabled()) { ClearAiChatHistory(delete_begin, delete_end); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) } void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings( @@ -99,10 +93,8 @@ void BraveBrowsingDataRemoverDelegate::ClearShieldsSettings( } } -#if BUILDFLAG(ENABLE_AI_CHAT) void BraveBrowsingDataRemoverDelegate::ClearAiChatHistory(base::Time begin_time, base::Time end_time) { // Handler for the Brave Leo History clearing. // It is prepared for future implementation. } -#endif // BUILDFLAG(ENABLE_AI_CHAT) diff --git a/browser/browsing_data/brave_browsing_data_remover_delegate.h b/browser/browsing_data/brave_browsing_data_remover_delegate.h index 606b2c84b0e..9b2b383eba9 100644 --- a/browser/browsing_data/brave_browsing_data_remover_delegate.h +++ b/browser/browsing_data/brave_browsing_data_remover_delegate.h @@ -10,7 +10,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" namespace content_settings { @@ -26,8 +25,8 @@ class BraveBrowsingDataRemoverDelegate content::BrowserContext* browser_context); ~BraveBrowsingDataRemoverDelegate() override; - BraveBrowsingDataRemoverDelegate( - const BraveBrowsingDataRemoverDelegate&) = delete; + BraveBrowsingDataRemoverDelegate(const BraveBrowsingDataRemoverDelegate&) = + delete; BraveBrowsingDataRemoverDelegate operator=( const BraveBrowsingDataRemoverDelegate&) = delete; @@ -41,13 +40,10 @@ class BraveBrowsingDataRemoverDelegate uint64_t remove_mask, content::BrowsingDataFilterBuilder* filter_builder, uint64_t origin_type_mask, - base::OnceCallback callback) - override; + base::OnceCallback callback) override; void ClearShieldsSettings(base::Time begin_time, base::Time end_time); -#if BUILDFLAG(ENABLE_AI_CHAT) void ClearAiChatHistory(base::Time begin_time, base::Time end_time); -#endif // BUILDFLAG(ENABLE_AI_CHAT) raw_ptr profile_ = nullptr; base::WeakPtrFactory weak_ptr_factory_{ diff --git a/browser/browsing_data/brave_clear_browsing_data.cc b/browser/browsing_data/brave_clear_browsing_data.cc index e63a2d0682d..f105c3acf03 100644 --- a/browser/browsing_data/brave_clear_browsing_data.cc +++ b/browser/browsing_data/brave_clear_browsing_data.cc @@ -11,7 +11,6 @@ #include "base/run_loop.h" #include "base/scoped_multi_source_observation.h" #include "base/trace_event/trace_event.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" #include "chrome/browser/lifetime/browser_shutdown.h" @@ -71,26 +70,31 @@ bool BrowsingDataRemovalWatcher::GetClearBrowsingDataOnExitSettings( uint64_t site_data_mask = chrome_browsing_data_remover::DATA_TYPE_SITE_DATA; // Don't try to clear LSO data if it's not supported. if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistoryOnExit) && - prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) + prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_HISTORY; + } if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistoryOnExit) && - prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) + prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { *remove_mask |= content::BrowsingDataRemover::DATA_TYPE_DOWNLOADS; + } - if (prefs->GetBoolean(browsing_data::prefs::kDeleteCacheOnExit)) + if (prefs->GetBoolean(browsing_data::prefs::kDeleteCacheOnExit)) { *remove_mask |= content::BrowsingDataRemover::DATA_TYPE_CACHE; + } if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookiesOnExit)) { *remove_mask |= site_data_mask; *origin_mask |= content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB; } - if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswordsOnExit)) + if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswordsOnExit)) { *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_PASSWORDS; + } - if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormDataOnExit)) + if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormDataOnExit)) { *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_FORM_DATA; + } if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsDataOnExit)) { *remove_mask |= site_data_mask; @@ -100,14 +104,13 @@ bool BrowsingDataRemovalWatcher::GetClearBrowsingDataOnExitSettings( // Note: this will also delete Brave Shields site-specific settings. // Corresponds to "Content settings" checkbox in the Clear Browsing Data // dialog. - if (prefs->GetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit)) + if (prefs->GetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit)) { *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS; + } -#if BUILDFLAG(ENABLE_AI_CHAT) if (prefs->GetBoolean(browsing_data::prefs::kDeleteBraveLeoHistoryOnExit)) { *remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; } -#endif // BUILDFLAG(ENABLE_AI_CHAT) return (*remove_mask != 0); } @@ -132,19 +135,22 @@ void BrowsingDataRemovalWatcher::ClearBrowsingDataForLoadedProfiles( std::vector profiles = profile_manager->GetLoadedProfiles(); for (Profile* profile : profiles) { - if (profile->IsOffTheRecord()) + if (profile->IsOffTheRecord()) { continue; + } uint64_t remove_mask; uint64_t origin_mask; if (!GetClearBrowsingDataOnExitSettings(profile, &remove_mask, - &origin_mask)) + &origin_mask)) { continue; + } ++num_profiles_to_clear_; content::BrowsingDataRemover* remover = profile->GetBrowsingDataRemover(); observer_.AddObservation(remover); - if (testing_callback) + if (testing_callback) { testing_callback->BeforeClearOnExitRemoveData(remover, remove_mask, origin_mask); + } remover->RemoveAndReply(base::Time(), base::Time::Max(), remove_mask, origin_mask, this); } @@ -153,15 +159,17 @@ void BrowsingDataRemovalWatcher::ClearBrowsingDataForLoadedProfiles( } void BrowsingDataRemovalWatcher::Wait() { - if (num_profiles_to_clear_ > 0) + if (num_profiles_to_clear_ > 0) { run_loop_.Run(); + } } void BrowsingDataRemovalWatcher::OnBrowsingDataRemoverDone( uint64_t failed_data_types) { --num_profiles_to_clear_; - if (num_profiles_to_clear_ > 0) + if (num_profiles_to_clear_ > 0) { return; + } run_loop_.Quit(); } diff --git a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc index 3c341577eff..ac8fc9c7cfe 100644 --- a/browser/browsing_data/brave_clear_browsing_data_browsertest.cc +++ b/browser/browsing_data/brave_clear_browsing_data_browsertest.cc @@ -16,7 +16,6 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" #include "chrome/browser/profiles/profile.h" @@ -81,8 +80,9 @@ class BrowserChangeObserver : public BrowserListObserver { } void OnBrowserRemoved(Browser* browser) override { - if (browser_ && browser_ != browser) + if (browser_ && browser_ != browser) { return; + } if (type_ == ChangeType::kRemoved) { browser_ = browser; @@ -113,8 +113,9 @@ class BraveClearDataOnExitTest void TearDownOnMainThread() override { // Borrowed from browser_browsertest.cc. // Cycle the MessageLoop: one for each browser. - for (unsigned int i = 0; i < browsers_count_; ++i) + for (unsigned int i = 0; i < browsers_count_; ++i) { content::RunAllPendingInMessageLoop(); + } // Run the application event loop to completion, which will cycle the // native MessagePump on all platforms. @@ -162,10 +163,8 @@ class BraveClearDataOnExitTest true); prefService->SetBoolean(browsing_data::prefs::kDeleteSiteSettingsOnExit, true); -#if BUILDFLAG(ENABLE_AI_CHAT) prefService->SetBoolean(browsing_data::prefs::kDeleteBraveLeoHistoryOnExit, true); -#endif // BUILDFLAG(ENABLE_AI_CHAT) } uint64_t GetRemoveMaskAll() { @@ -175,9 +174,7 @@ class BraveClearDataOnExitTest chrome_browsing_data_remover::DATA_TYPE_SITE_DATA | chrome_browsing_data_remover::DATA_TYPE_PASSWORDS | chrome_browsing_data_remover::DATA_TYPE_FORM_DATA | -#if BUILDFLAG(ENABLE_AI_CHAT) chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY | -#endif // BUILDFLAG(ENABLE_AI_CHAT) chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS; } @@ -192,10 +189,12 @@ class BraveClearDataOnExitTest uint64_t origin_mask) override { remove_data_call_count_++; - if (expected_remove_mask_) + if (expected_remove_mask_) { EXPECT_EQ(expected_remove_mask_, remove_mask); - if (expected_origin_mask_) + } + if (expected_origin_mask_) { EXPECT_EQ(expected_origin_mask_, origin_mask); + } } protected: @@ -282,9 +281,10 @@ class BraveClearDataOnExitTwoBrowsersTest : public BraveClearDataOnExitTest { std::ignore = profile2_dir_.Set(path); ProfileManager* profile_manager = g_browser_process->profile_manager(); size_t starting_number_of_profiles = profile_manager->GetNumberOfProfiles(); - if (!base::PathExists(path) && !base::CreateDirectory(path)) + if (!base::PathExists(path) && !base::CreateDirectory(path)) { NOTREACHED_IN_MIGRATION() << "Could not create directory at " << path.MaybeAsASCII(); + } Profile* profile = profile_manager->GetProfile(path); DCHECK(profile); EXPECT_EQ(starting_number_of_profiles + 1, diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn index bf9062e8273..73c5a0bf3f2 100644 --- a/browser/extensions/BUILD.gn +++ b/browser/extensions/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni") import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni") @@ -131,7 +130,6 @@ source_set("extensions") { "//brave/browser/brave_adaptive_captcha", "//brave/browser/brave_ads", "//brave/browser/brave_rewards", - "//brave/browser/brave_rewards", "//brave/browser/brave_rewards:util", "//brave/browser/component_updater", "//brave/browser/extensions/api:generated_api_registration", @@ -141,17 +139,13 @@ source_set("extensions") { "//brave/browser/ui:ui_public_dependencies", "//brave/common", "//brave/common/extensions/api", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", "//brave/components/brave_adaptive_captcha", - "//brave/components/brave_adaptive_captcha", - "//brave/components/brave_ads/browser", "//brave/components/brave_ads/browser", "//brave/components/brave_ads/core/public:headers", "//brave/components/brave_extension:static_resources", "//brave/components/brave_news/common", "//brave/components/brave_rewards/browser", - "//brave/components/brave_rewards/browser", - "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/common", "//brave/components/brave_rewards/common/mojom", "//brave/components/brave_shields/core/common", @@ -174,17 +168,14 @@ source_set("extensions") { "//chrome/browser:browser_process", "//chrome/browser:browser_public_dependencies", "//chrome/browser/extensions", - "//chrome/browser/extensions", "//chrome/browser/profiles:profile", "//chrome/browser/ui", "//chrome/common", "//components/browsing_data/core", "//components/gcm_driver:gcm_buildflags", "//components/prefs", - "//components/prefs", "//components/update_client:network_impl", "//content/public/browser", - "//content/public/browser", ] public_deps = [ @@ -203,10 +194,6 @@ source_set("extensions") { deps += [ "//brave/components/brave_wayback_machine" ] } - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common" ] - } - if (enable_speedreader) { deps += [ "//brave/components/speedreader" ] } diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index 2be2205416e..c12b7385511 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -6,7 +6,7 @@ #include "brave/browser/extensions/api/settings_private/brave_prefs_util.h" #include "brave/browser/ui/tabs/brave_tab_prefs.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/common/pref_names.h" #include "brave/components/brave_shields/core/common/pref_names.h" @@ -36,10 +36,6 @@ #include "brave/components/brave_wayback_machine/pref_names.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if defined(TOOLKIT_VIEWS) #include "brave/components/sidebar/browser/pref_names.h" #endif @@ -243,15 +239,13 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() { (*s_brave_allowlist)[kBraveWalletPrivateWindowsEnabled] = settings_api::PrefType::kBoolean; -// Leo Assistant pref -#if BUILDFLAG(ENABLE_AI_CHAT) + // Leo Assistant pref (*s_brave_allowlist)[ai_chat::prefs::kBraveChatAutocompleteProviderEnabled] = settings_api::PrefType::kBoolean; (*s_brave_allowlist)[ai_chat::prefs::kBraveAIChatContextMenuEnabled] = settings_api::PrefType::kBoolean; (*s_brave_allowlist)[ai_chat::prefs::kBraveAIChatShowToolbarButton] = settings_api::PrefType::kBoolean; -#endif #if !BUILDFLAG(USE_GCM_FROM_PLATFORM) // Push Messaging Pref diff --git a/browser/misc_metrics/BUILD.gn b/browser/misc_metrics/BUILD.gn index 852e8d63b0d..ffcf6bb9a16 100644 --- a/browser/misc_metrics/BUILD.gn +++ b/browser/misc_metrics/BUILD.gn @@ -3,12 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - source_set("misc_metrics") { sources = [ "//brave/browser/misc_metrics/process_misc_metrics.h" ] - - deps = [ "//brave/components/ai_chat/core/common/buildflags" ] } static_library("misc_metrics_impl") { @@ -32,7 +28,7 @@ static_library("misc_metrics_impl") { "//brave/browser:browser_process", "//brave/browser/misc_metrics", "//brave/browser/profiles:util", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/browser", "//brave/components/misc_metrics", "//brave/components/p3a_utils", "//brave/components/time_period_storage", @@ -67,10 +63,6 @@ static_library("misc_metrics_impl") { } else { sources += [ "//brave/browser/misc_metrics/misc_android_metrics.h" ] } - - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/browser" ] - } } source_set("unit_tests") { diff --git a/browser/misc_metrics/process_misc_metrics.cc b/browser/misc_metrics/process_misc_metrics.cc index a8b84035b48..16f5d92f69a 100644 --- a/browser/misc_metrics/process_misc_metrics.cc +++ b/browser/misc_metrics/process_misc_metrics.cc @@ -5,11 +5,11 @@ #include "brave/browser/misc_metrics/process_misc_metrics.h" +#include "brave/browser/misc_metrics/doh_metrics.h" #include "brave/browser/misc_metrics/uptime_monitor.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" - -#include "brave/browser/misc_metrics/doh_metrics.h" #if !BUILDFLAG(IS_ANDROID) #include "brave/browser/misc_metrics/vertical_tab_metrics.h" #include "brave/components/misc_metrics/menu_metrics.h" @@ -18,9 +18,6 @@ #include "brave/components/misc_metrics/privacy_hub_metrics.h" #include "brave/components/misc_metrics/tab_metrics.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#endif namespace misc_metrics { @@ -34,9 +31,7 @@ ProcessMiscMetrics::ProcessMiscMetrics(PrefService* local_state) { std::make_unique(local_state); tab_metrics_ = std::make_unique(local_state); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat_metrics_ = std::make_unique(local_state); -#endif doh_metrics_ = std::make_unique(local_state); uptime_monitor_ = std::make_unique(local_state); } @@ -69,11 +64,9 @@ UptimeMonitor* ProcessMiscMetrics::uptime_monitor() { return uptime_monitor_.get(); } -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::AIChatMetrics* ProcessMiscMetrics::ai_chat_metrics() { return ai_chat_metrics_.get(); } -#endif void ProcessMiscMetrics::RegisterPrefs(PrefRegistrySimple* registry) { #if !BUILDFLAG(IS_ANDROID) @@ -84,9 +77,7 @@ void ProcessMiscMetrics::RegisterPrefs(PrefRegistrySimple* registry) { PrivacyHubMetrics::RegisterPrefs(registry); TabMetrics::RegisterPrefs(registry); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::AIChatMetrics::RegisterPrefs(registry); -#endif DohMetrics::RegisterPrefs(registry); UptimeMonitor::RegisterPrefs(registry); } diff --git a/browser/misc_metrics/process_misc_metrics.h b/browser/misc_metrics/process_misc_metrics.h index d6e258db3cd..9aa5e727456 100644 --- a/browser/misc_metrics/process_misc_metrics.h +++ b/browser/misc_metrics/process_misc_metrics.h @@ -8,17 +8,14 @@ #include -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "build/build_config.h" class PrefRegistrySimple; class PrefService; -#if BUILDFLAG(ENABLE_AI_CHAT) namespace ai_chat { class AIChatMetrics; } // namespace ai_chat -#endif namespace misc_metrics { @@ -52,9 +49,7 @@ class ProcessMiscMetrics { TabMetrics* tab_metrics(); #endif UptimeMonitor* uptime_monitor(); -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::AIChatMetrics* ai_chat_metrics(); -#endif private: #if !BUILDFLAG(IS_ANDROID) @@ -65,9 +60,7 @@ class ProcessMiscMetrics { std::unique_ptr privacy_hub_metrics_; std::unique_ptr tab_metrics_; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) std::unique_ptr ai_chat_metrics_; -#endif std::unique_ptr doh_metrics_; std::unique_ptr uptime_monitor_; }; diff --git a/browser/misc_metrics/sources.gni b/browser/misc_metrics/sources.gni index 8f157ce80b4..7bc742e1d00 100644 --- a/browser/misc_metrics/sources.gni +++ b/browser/misc_metrics/sources.gni @@ -3,8 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - # These files needs access to some files in chrome/browser target. brave_browser_misc_metrics_sources = [ "//brave/browser/misc_metrics/profile_misc_metrics_service.cc", @@ -15,6 +13,7 @@ brave_browser_misc_metrics_sources = [ brave_browser_misc_metrics_deps = [ "//brave/browser:browser_process", "//brave/browser/profiles:util", + "//brave/components/ai_chat/core/browser", "//brave/components/misc_metrics", "//chrome/browser:browser_process", "//chrome/browser/profiles:profiles", @@ -23,11 +22,6 @@ brave_browser_misc_metrics_deps = [ "//content/public/browser", ] -if (enable_ai_chat) { - brave_browser_misc_metrics_deps += - [ "//brave/components/ai_chat/core/browser" ] -} - brave_browser_misc_metrics_android_sources = [ "//brave/browser/misc_metrics/misc_android_metrics.cc", "//brave/browser/misc_metrics/misc_android_metrics_factory_android.cc", diff --git a/browser/perf/brave_perf_features_processor.cc b/browser/perf/brave_perf_features_processor.cc index 96a26c0b56f..f66cd6c4121 100644 --- a/browser/perf/brave_perf_features_processor.cc +++ b/browser/perf/brave_perf_features_processor.cc @@ -10,7 +10,7 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/browser/perf/brave_perf_switches.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/browser/rewards_service.h" @@ -25,10 +25,6 @@ #include "brave/components/speedreader/speedreader_pref_names.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - namespace { void FakeCallback(brave_rewards::mojom::CreateRewardsWalletResult) {} @@ -83,12 +79,10 @@ void MaybeEnableBraveFeatureForPerfTesting(Profile* profile) { profile->GetPrefs()->SetBoolean(speedreader::kSpeedreaderPrefEnabled, true); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) profile->GetPrefs()->SetTime(ai_chat::prefs::kLastAcceptedDisclaimer, base::Time::Now()); profile->GetPrefs()->SetBoolean( ai_chat::prefs::kBraveChatAutocompleteProviderEnabled, true); -#endif // BUILDFLAG(ENABLE_AI_CHAT) // Adblock EnableAdblockCookieList(profile->GetWeakPtr()); diff --git a/browser/perf/brave_perf_features_processor_browsertest.cc b/browser/perf/brave_perf_features_processor_browsertest.cc index 1d533d60f48..0dcbdf986b2 100644 --- a/browser/perf/brave_perf_features_processor_browsertest.cc +++ b/browser/perf/brave_perf_features_processor_browsertest.cc @@ -6,7 +6,7 @@ #include "base/scoped_observation.h" #include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/browser/perf/brave_perf_switches.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/brave_ads/core/public/prefs/pref_names.h" #include "brave/components/brave_news/common/pref_names.h" #include "brave/components/brave_rewards/browser/rewards_service.h" @@ -24,10 +24,6 @@ #include "brave/components/speedreader/speedreader_service.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - namespace { class TestRewardsServiceObserver : public brave_rewards::RewardsServiceObserver { @@ -99,9 +95,7 @@ IN_PROC_BROWSER_TEST_F(BraveSpeedFeatureProcessorBrowserTest, Default) { EXPECT_TRUE(BraveNewsAreEnabled()); WaitForRewardsServiceInitialized(); -#if BUILDFLAG(ENABLE_AI_CHAT) auto* prefs = browser()->profile()->GetPrefs(); EXPECT_TRUE(ai_chat::IsAIChatEnabled(prefs)); EXPECT_TRUE(ai_chat::HasUserOptedIn(prefs)); -#endif // BUILDFLAG(ENABLE_AI_CHAT) } diff --git a/browser/policy/brave_simple_policy_map.h b/browser/policy/brave_simple_policy_map.h index 9228e95d50f..fa9f23f85ea 100644 --- a/browser/policy/brave_simple_policy_map.h +++ b/browser/policy/brave_simple_policy_map.h @@ -6,7 +6,7 @@ #ifndef BRAVE_BROWSER_POLICY_BRAVE_SIMPLE_POLICY_MAP_H_ #define BRAVE_BROWSER_POLICY_BRAVE_SIMPLE_POLICY_MAP_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/constants/pref_names.h" #include "brave/components/tor/buildflags/buildflags.h" @@ -28,10 +28,6 @@ #include "brave/components/brave_vpn/common/pref_names.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - namespace policy { inline constexpr PolicyToPreferenceMapEntry kBraveSimplePolicyMap[] = { @@ -56,10 +52,8 @@ inline constexpr PolicyToPreferenceMapEntry kBraveSimplePolicyMap[] = { {policy::key::kBraveVPNDisabled, brave_vpn::prefs::kManagedBraveVPNDisabled, base::Value::Type::BOOLEAN}, #endif -#if BUILDFLAG(ENABLE_AI_CHAT) {policy::key::kBraveAIChatEnabled, ai_chat::prefs::kEnabledByPolicy, base::Value::Type::BOOLEAN}, -#endif }; } // namespace policy diff --git a/browser/prefs/brave_pref_service_incognito_allowlist.cc b/browser/prefs/brave_pref_service_incognito_allowlist.cc index 441e68885e3..1d58a93c6d1 100644 --- a/browser/prefs/brave_pref_service_incognito_allowlist.cc +++ b/browser/prefs/brave_pref_service_incognito_allowlist.cc @@ -7,7 +7,7 @@ #include "base/no_destructor.h" #include "brave/browser/ui/bookmark/brave_bookmark_prefs.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/constants/pref_names.h" #include "build/build_config.h" @@ -17,10 +17,6 @@ #include "brave/browser/ui/tabs/brave_tab_prefs.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if defined(TOOLKIT_VIEWS) #include "brave/components/sidebar/browser/pref_names.h" #endif @@ -46,10 +42,8 @@ const std::vector& GetBravePersistentPrefNames() { #if defined(TOOLKIT_VIEWS) sidebar::kSidePanelWidth, #endif -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::prefs::kLastAcceptedDisclaimer, ai_chat::prefs::kBraveChatAutocompleteProviderEnabled, -#endif // BUILDFLAG(ENABLE_AI_CHAT) brave::bookmarks::prefs::kShowAllBookmarksButton, }); diff --git a/browser/renderer_context_menu/test/BUILD.gn b/browser/renderer_context_menu/test/BUILD.gn index 36ea97538a7..afc656df881 100644 --- a/browser/renderer_context_menu/test/BUILD.gn +++ b/browser/renderer_context_menu/test/BUILD.gn @@ -3,8 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - source_set("unit_tests") { testonly = true assert(is_win || is_linux || is_mac) @@ -12,7 +10,7 @@ source_set("unit_tests") { deps = [ "//base", "//brave/app:command_ids", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", "//chrome/browser", "//chrome/browser/search_engines", "//chrome/test:test_support", @@ -24,8 +22,4 @@ source_set("unit_tests") { "//testing/gtest", "//third_party/abseil-cpp:absl", ] - - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common" ] - } } diff --git a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc index 10fd59a005d..3e997d7cf83 100644 --- a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc +++ b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc @@ -8,7 +8,7 @@ #include #include "brave/app/brave_command_ids.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" @@ -28,10 +28,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/clipboard/clipboard.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - namespace { content::ContextMenuParams CreateSelectedTextParams( @@ -183,7 +179,6 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForLink) { EXPECT_TRUE(context_menu->IsCommandIdEnabled(IDC_COPY_CLEAN_LINK)); } -#if BUILDFLAG(ENABLE_AI_CHAT) TEST_F(BraveRenderViewContextMenuTest, MenuForAIChat) { content::ContextMenuParams params = CreateSelectedTextParams(u"hello"); @@ -200,6 +195,7 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForAIChat) { enabled); } } + TEST_F(BraveRenderViewContextMenuTest, MenuForAIChat_PWA) { content::ContextMenuParams params = CreateSelectedTextParams(u"hello"); @@ -211,4 +207,3 @@ TEST_F(BraveRenderViewContextMenuTest, MenuForAIChat_PWA) { IDC_AI_CHAT_CONTEXT_LEO_TOOLS); EXPECT_FALSE(ai_chat_index.has_value()); } -#endif diff --git a/browser/resources/settings/settings.gni b/browser/resources/settings/settings.gni index a3f7296645b..3289f881441 100644 --- a/browser/resources/settings/settings.gni +++ b/browser/resources/settings/settings.gni @@ -8,6 +8,7 @@ import("//chrome/browser/resources/settings/settings.gni") settings_namespace_rewrites = [ "settings.BraveAppearanceBrowserProxyImpl|BraveAppearanceBrowserProxyImpl", + "settings.BraveLeoAssistantBrowserProxyImpl|BraveLeoAssistantBrowserProxyImpl", "settings.BraveVPNBrowserProxyImpl|BraveVPNBrowserProxyImpl", "settings.BraveWalletBrowserProxyImpl|BraveWalletBrowserProxyImpl", "settings.BraveDefaultExtensionsBrowserProxyImpl|BraveDefaultExtensionsBrowserProxyImpl", @@ -27,9 +28,5 @@ if (enable_pin_shortcut) { ] } -if (enable_ai_chat) { - settings_namespace_rewrites += [ "settings.BraveLeoAssistantBrowserProxyImpl|BraveLeoAssistantBrowserProxyImpl" ] -} - settings_auto_imports = [ "chrome/browser/resources/settings/router.html|Router,Route" ] diff --git a/browser/sources.gni b/browser/sources.gni index e98a3a6217e..03a26d19ef7 100644 --- a/browser/sources.gni +++ b/browser/sources.gni @@ -44,7 +44,6 @@ import("//brave/browser/webcompat_reporter/sources.gni") import("//brave/build/config.gni") import("//brave/chromium_src/chrome/browser/prefs/sources.gni") import("//brave/chromium_src/chrome/browser/sources.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/ai_rewriter/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni") @@ -117,6 +116,7 @@ brave_chrome_browser_deps = [ "//brave/app:brave_generated_resources_grit", "//brave/browser:browser_process", "//brave/browser:sparkle_buildflags", + "//brave/browser/ai_chat", "//brave/browser/brave_adaptive_captcha", "//brave/browser/brave_adaptive_captcha:impl", "//brave/browser/brave_ads", @@ -141,7 +141,10 @@ brave_chrome_browser_deps = [ "//brave/browser/ui", "//brave/common", "//brave/common:mojo_bindings", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/content/browser", + "//brave/components/ai_chat/core/browser", + "//brave/components/ai_chat/core/common", + "//brave/components/ai_chat/core/common/mojom", "//brave/components/ai_rewriter/common/buildflags", "//brave/components/body_sniffer", "//brave/components/brave_adaptive_captcha", @@ -284,12 +287,18 @@ if (!is_android) { ] brave_chrome_browser_deps += [ + "//brave/browser/ui/ai_chat", "//components/feed:feature_list", "//components/feed/core/v2:feed_core_v2", "//components/feed/mojom:mojo_bindings", ] } +if (is_android) { + brave_chrome_browser_sources += brave_browser_ai_chat_android_sources + brave_chrome_browser_deps += brave_browser_ai_chat_android_deps +} + if (enable_commander) { brave_chrome_browser_deps += [ "//brave/components/commander/browser", @@ -339,25 +348,6 @@ if (enable_request_otr) { brave_chrome_browser_deps += [ "//brave/components/request_otr/common" ] } -if (enable_ai_chat) { - brave_chrome_browser_deps += [ - "//brave/browser/ai_chat", - "//brave/components/ai_chat/content/browser", - "//brave/components/ai_chat/core/browser", - "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/mojom", - ] - - if (!is_android) { - brave_chrome_browser_deps += [ "//brave/browser/ui/ai_chat" ] - } - - if (is_android) { - brave_chrome_browser_sources += brave_browser_ai_chat_android_sources - brave_chrome_browser_deps += brave_browser_ai_chat_android_deps - } -} - if (enable_ai_rewriter) { brave_chrome_browser_deps += [ "//brave/components/ai_rewriter/common" ] } diff --git a/browser/speedreader/speedreader_browsertest.cc b/browser/speedreader/speedreader_browsertest.cc index 79740994be7..2e4fc2f5d22 100644 --- a/browser/speedreader/speedreader_browsertest.cc +++ b/browser/speedreader/speedreader_browsertest.cc @@ -22,7 +22,7 @@ #include "brave/browser/ui/page_action/brave_page_action_icon_type.h" #include "brave/browser/ui/views/frame/brave_browser_view.h" #include "brave/browser/ui/webui/speedreader/speedreader_toolbar_data_handler_impl.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/speedreader/common/constants.h" @@ -63,10 +63,6 @@ #include "net/test/embedded_test_server/http_response.h" #include "services/network/public/cpp/network_switches.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif - constexpr char kTestHost[] = "a.test"; constexpr char kTestPageSimple[] = "/simple.html"; constexpr char kTestPageReadable[] = "/speedreader/article/guardian.html"; @@ -94,21 +90,11 @@ class SpeedReaderBrowserTest : public InProcessBrowserTest { public: SpeedReaderBrowserTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { -#if BUILDFLAG(ENABLE_AI_CHAT) feature_list_.InitWithFeaturesAndParameters( {{speedreader::kSpeedreaderFeature, - { - { speedreader::kSpeedreaderTTS.name, - "true" } - }}, - { ai_chat::features::kAIChat, - { {} } }}, + {{speedreader::kSpeedreaderTTS.name, "true"}}}, + {ai_chat::features::kAIChat, {{}}}}, {}); -#else - feature_list_.InitAndEnableFeatureWithParameters( - speedreader::kSpeedreaderFeature, - {{speedreader::kSpeedreaderTTS.name, "true"}}); -#endif } SpeedReaderBrowserTest(const SpeedReaderBrowserTest&) = delete; @@ -780,7 +766,6 @@ IN_PROC_BROWSER_TEST_F(SpeedReaderBrowserTest, Toolbar) { auto* toolbar = toolbar_view->GetWebContentsForTesting(); WaitElement(toolbar, "appearance"); -#if BUILDFLAG(ENABLE_AI_CHAT) Click(toolbar, "ai"); auto* side_panel = browser()->GetFeatures().side_panel_ui(); while (side_panel->GetCurrentEntryId() != SidePanelEntryId::kChatUI) { @@ -792,7 +777,6 @@ IN_PROC_BROWSER_TEST_F(SpeedReaderBrowserTest, Toolbar) { NonBlockingDelay(base::Milliseconds(10)); } EXPECT_FALSE(side_panel->GetCurrentEntryId().has_value()); -#endif Click(toolbar, "appearance"); { // change theme diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 4530823438f..9fecf2c83dd 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -6,7 +6,6 @@ import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni") import("//brave/browser/shell_integrations/buildflags/buildflags.gni") import("//brave/build/config.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/ai_rewriter/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni") @@ -48,6 +47,7 @@ source_set("ui") { ] deps = [ + "//brave/browser/ai_chat", "//brave/browser/brave_adaptive_captcha", "//brave/browser/brave_ads", "//brave/browser/brave_rewards", @@ -62,6 +62,10 @@ source_set("ui") { sources = [ "brave_ui_features.cc", "brave_ui_features.h", + "webui/ai_chat/ai_chat_ui.cc", + "webui/ai_chat/ai_chat_ui.h", + "webui/ai_chat/ai_chat_ui_page_handler.cc", + "webui/ai_chat/ai_chat_ui_page_handler.h", "webui/brave_adblock_internals_ui.cc", "webui/brave_adblock_internals_ui.h", "webui/brave_adblock_ui.cc", @@ -101,42 +105,31 @@ source_set("ui") { deps += [ "//brave/components/webcompat_reporter/common:mojom" ] } - if (enable_ai_chat) { + if (enable_print_preview) { sources += [ - "webui/ai_chat/ai_chat_ui.cc", - "webui/ai_chat/ai_chat_ui.h", - "webui/ai_chat/ai_chat_ui_page_handler.cc", - "webui/ai_chat/ai_chat_ui_page_handler.h", + "ai_chat/print_preview_extractor.cc", + "ai_chat/print_preview_extractor.h", + ] + deps += [ + "//chrome/browser/pdf", + "//chrome/browser/pdf:pdf_pref_names", + "//chrome/services/printing/public/mojom", + "//components/pdf/browser", + "//components/printing/browser", + "//components/printing/common:mojo_interfaces", + "//components/services/print_compositor/public/mojom", + "//pdf:buildflags", + "//pdf:features", + ] + } + + if (is_android) { + sources += [ + "android/ai_chat/brave_leo_settings_launcher_helper.cc", + "android/ai_chat/brave_leo_settings_launcher_helper.h", ] - deps += [ "//brave/browser/ai_chat" ] - - if (enable_print_preview) { - sources += [ - "ai_chat/print_preview_extractor.cc", - "ai_chat/print_preview_extractor.h", - ] - deps += [ - "//chrome/browser/pdf", - "//chrome/browser/pdf:pdf_pref_names", - "//chrome/services/printing/public/mojom", - "//components/pdf/browser", - "//components/printing/browser", - "//components/printing/common:mojo_interfaces", - "//components/services/print_compositor/public/mojom", - "//pdf:buildflags", - "//pdf:features", - ] - } - - if (is_android) { - sources += [ - "android/ai_chat/brave_leo_settings_launcher_helper.cc", - "android/ai_chat/brave_leo_settings_launcher_helper.h", - ] - - deps += [ "//brave/build/android:jni_headers" ] - } + deps += [ "//brave/build/android:jni_headers" ] } if (enable_ai_rewriter) { @@ -301,6 +294,8 @@ source_set("ui") { "webui/settings/brave_privacy_handler.h", "webui/settings/brave_search_engines_handler.cc", "webui/settings/brave_search_engines_handler.h", + "webui/settings/brave_settings_leo_assistant_handler.cc", + "webui/settings/brave_settings_leo_assistant_handler.h", "webui/settings/brave_settings_localized_strings_provider.cc", "webui/settings/brave_settings_localized_strings_provider.h", "webui/settings/brave_site_settings_handler.cc", @@ -339,6 +334,7 @@ source_set("ui") { "//brave/components/speedreader/common/buildflags", "//chrome/app:generated_resources", "//chrome/browser/content_settings:content_settings_factory", + "//chrome/browser/favicon", "//chrome/browser/importer", "//chrome/browser/profiles", "//chrome/browser/search", @@ -389,15 +385,6 @@ source_set("ui") { ] } - if (enable_ai_chat) { - sources += [ - "webui/settings/brave_settings_leo_assistant_handler.cc", - "webui/settings/brave_settings_leo_assistant_handler.h", - ] - - deps += [ "//chrome/browser/favicon" ] - } - if (is_mac) { sources += [ "webui/settings/brave_full_disk_access_confirm_dialog_delegate.h", @@ -549,6 +536,7 @@ source_set("ui") { "views/page_action/brave_page_action_icon_container_view.h", "views/rounded_separator.cc", "views/rounded_separator.h", + "views/side_panel/ai_chat/ai_chat_side_panel_utils_views.cc", "views/side_panel/bookmarks/brave_bookmarks_side_panel_coordinator.cc", "views/side_panel/bookmarks/brave_bookmarks_side_panel_coordinator.h", "views/side_panel/brave_bookmarks_side_panel_view.cc", @@ -602,6 +590,8 @@ source_set("ui") { "views/tabs/tab_drag_controller.h", "views/tabs/vertical_tab_utils.cc", "views/tabs/vertical_tab_utils.h", + "views/toolbar/ai_chat_button.cc", + "views/toolbar/ai_chat_button.h", "views/toolbar/bookmark_button.cc", "views/toolbar/bookmark_button.h", "views/toolbar/brave_app_menu.cc", @@ -641,13 +631,7 @@ source_set("ui") { deps += [ "//brave/browser/brave_vpn/win:wireguard_utils" ] } } - if (enable_ai_chat) { - sources += [ - "views/side_panel/ai_chat/ai_chat_side_panel_utils_views.cc", - "views/toolbar/ai_chat_button.cc", - "views/toolbar/ai_chat_button.h", - ] - } + if (use_aura) { sources += [ "views/renderer_context_menu/brave_render_view_context_menu_views.cc", @@ -769,7 +753,11 @@ source_set("ui") { # to pull in dependencies needed for the overwrite codes in chromium_src. "//brave/chromium_src/chrome/browser/ui", "//brave/common", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/content/browser", + "//brave/components/ai_chat/core/browser", + "//brave/components/ai_chat/core/common", + "//brave/components/ai_chat/core/common/mojom", + "//brave/components/ai_chat/resources/page:generated_resources", "//brave/components/ai_rewriter/common/buildflags", "//brave/components/brave_adaptive_captcha", "//brave/components/brave_adblock_ui:generated_resources", @@ -1084,16 +1072,6 @@ source_set("ui") { ] } - if (enable_ai_chat) { - deps += [ - "//brave/components/ai_chat/content/browser", - "//brave/components/ai_chat/core/browser", - "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/mojom", - "//brave/components/ai_chat/resources/page:generated_resources", - ] - } - if (enable_extensions && toolkit_views) { sources += [ "toolbar/brave_location_bar_model_delegate.cc", diff --git a/browser/ui/ai_chat/BUILD.gn b/browser/ui/ai_chat/BUILD.gn index 04e79ce4122..08fe8f927b1 100644 --- a/browser/ui/ai_chat/BUILD.gn +++ b/browser/ui/ai_chat/BUILD.gn @@ -3,9 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") -assert(enable_ai_chat) - if (!is_android) { source_set("ai_chat") { sources = [ diff --git a/browser/ui/brave_browser_actions.cc b/browser/ui/brave_browser_actions.cc index 19039487c38..a22eb45db32 100644 --- a/browser/ui/brave_browser_actions.cc +++ b/browser/ui/brave_browser_actions.cc @@ -5,7 +5,7 @@ #include "brave/browser/ui/brave_browser_actions.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/playlist/common/buildflags/buildflags.h" #include "brave/components/vector_icons/vector_icons.h" #include "chrome/browser/profiles/profile.h" @@ -18,10 +18,6 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/vector_icon_types.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if BUILDFLAG(ENABLE_PLAYLIST) #include "brave/components/playlist/common/features.h" #endif // BUILDFLAG(ENABLE_PLAYLIST) @@ -67,7 +63,6 @@ void BraveBrowserActions::InitializeBrowserActions() { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) Profile* profile = browser_->profile(); if (ai_chat::IsAIChatEnabled(profile->GetPrefs())) { root_action_item_->AddChild( @@ -76,5 +71,4 @@ void BraveBrowserActions::InitializeBrowserActions() { kActionSidePanelShowChatUI, browser, false) .Build()); } -#endif } diff --git a/browser/ui/brave_browser_command_controller.cc b/browser/ui/brave_browser_command_controller.cc index 9a6da9c9b5a..1090d9ef199 100644 --- a/browser/ui/brave_browser_command_controller.cc +++ b/browser/ui/brave_browser_command_controller.cc @@ -12,14 +12,16 @@ #include "base/feature_list.h" #include "base/types/to_address.h" #include "brave/app/brave_command_ids.h" +#include "brave/browser/ai_chat/ai_chat_utils.h" #include "brave/browser/profiles/profile_util.h" #include "brave/browser/ui/brave_pages.h" #include "brave/browser/ui/browser_commands.h" #include "brave/browser/ui/sidebar/sidebar_utils.h" #include "brave/browser/ui/tabs/features.h" #include "brave/browser/ui/tabs/split_view_browser_data.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/ai_chat/core/common/features.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_rewards/common/rewards_util.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/common/common_utils.h" @@ -43,12 +45,6 @@ #include "components/sync/base/command_line_switches.h" #include "content/public/browser/web_contents.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ai_chat/ai_chat_utils.h" -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/browser/brave_vpn/brave_vpn_service_factory.h" #include "brave/browser/brave_vpn/vpn_utils.h" @@ -234,10 +230,8 @@ void BraveBrowserCommandController::InitBraveCommandState() { UpdateCommandForBraveVPN(); UpdateCommandForPlaylist(); UpdateCommandForWaybackMachine(); -#if BUILDFLAG(ENABLE_AI_CHAT) || BUILDFLAG(ENABLE_BRAVE_VPN) pref_change_registrar_.Init(browser_->profile()->GetPrefs()); -#endif -#if BUILDFLAG(ENABLE_AI_CHAT) + UpdateCommandForAIChat(); if (ai_chat::IsAllowedForContext(browser_->profile(), false)) { pref_change_registrar_.Add( @@ -246,7 +240,7 @@ void BraveBrowserCommandController::InitBraveCommandState() { &BraveBrowserCommandController::UpdateCommandForAIChat, base::Unretained(this))); } -#endif + #if BUILDFLAG(ENABLE_BRAVE_VPN) if (brave_vpn::IsAllowedForContext(browser_->profile())) { pref_change_registrar_.Add( @@ -353,7 +347,6 @@ void BraveBrowserCommandController::UpdateCommandForSidebar() { } } -#if BUILDFLAG(ENABLE_AI_CHAT) void BraveBrowserCommandController::UpdateCommandForAIChat() { // AI Chat command implementation needs sidebar bool allowed_for_context = ai_chat::IsAllowedForContext(browser_->profile()); @@ -363,7 +356,6 @@ void BraveBrowserCommandController::UpdateCommandForAIChat() { IDC_OPEN_FULL_PAGE_CHAT, ai_chat::features::IsAIChatHistoryEnabled() && allowed_for_context); } -#endif void BraveBrowserCommandController::UpdateCommandForBraveVPN() { #if BUILDFLAG(ENABLE_BRAVE_VPN) @@ -542,14 +534,10 @@ bool BraveBrowserCommandController::ExecuteBraveCommandWithDisposition( brave::ShowBraveWallet(&*browser_); break; case IDC_TOGGLE_AI_CHAT: -#if BUILDFLAG(ENABLE_AI_CHAT) brave::ToggleAIChat(&*browser_); -#endif break; case IDC_OPEN_FULL_PAGE_CHAT: -#if BUILDFLAG(ENABLE_AI_CHAT) brave::ShowFullpageChat(&*browser_); -#endif break; case IDC_SPEEDREADER_ICON_ONCLICK: brave::MaybeDistillAndShowSpeedreaderBubble(&*browser_); diff --git a/browser/ui/brave_browser_command_controller.h b/browser/ui/brave_browser_command_controller.h index cb603915324..e80af24bc74 100644 --- a/browser/ui/brave_browser_command_controller.h +++ b/browser/ui/brave_browser_command_controller.h @@ -13,7 +13,6 @@ #include "base/scoped_observation.h" #include "brave/browser/ui/tabs/split_view_browser_data.h" #include "brave/browser/ui/tabs/split_view_browser_data_observer.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/tor/buildflags/buildflags.h" #include "chrome/browser/ui/browser_command_controller.h" @@ -102,9 +101,7 @@ class BraveBrowserCommandController : public chrome::BrowserCommandController, void UpdateCommandForBraveSync(); void UpdateCommandForBraveWallet(); void UpdateCommandForSidebar(); -#if BUILDFLAG(ENABLE_AI_CHAT) void UpdateCommandForAIChat(); -#endif void UpdateCommandForBraveVPN(); void UpdateCommandForPlaylist(); void UpdateCommandForWaybackMachine(); @@ -116,9 +113,8 @@ class BraveBrowserCommandController : public chrome::BrowserCommandController, bool ExecuteBraveCommandWithDisposition(int id, WindowOpenDisposition disposition, base::TimeTicks time_stamp); -#if BUILDFLAG(ENABLE_BRAVE_VPN) || BUILDFLAG(ENABLE_AI_CHAT) + PrefChangeRegistrar pref_change_registrar_; -#endif const raw_ref browser_; CommandUpdaterImpl brave_command_updater_; diff --git a/browser/ui/brave_browser_command_controller_browsertest.cc b/browser/ui/brave_browser_command_controller_browsertest.cc index 682d99e133b..52db6a8750e 100644 --- a/browser/ui/brave_browser_command_controller_browsertest.cc +++ b/browser/ui/brave_browser_command_controller_browsertest.cc @@ -12,7 +12,7 @@ #include "base/test/scoped_feature_list.h" #include "brave/app/brave_command_ids.h" #include "brave/browser/ui/browser_commands.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/skus/common/features.h" #include "brave/components/tor/buildflags/buildflags.h" @@ -37,10 +37,6 @@ #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#endif - #if BUILDFLAG(ENABLE_TOR) #include "brave/browser/tor/tor_profile_service_factory.h" #endif @@ -80,7 +76,6 @@ class BraveBrowserCommandControllerTest : public InProcessBrowserTest { policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); } -#if BUILDFLAG(ENABLE_AI_CHAT) void BlockAIChatByPolicy(bool value) { policy::PolicyMap policies; policies.Set(policy::key::kBraveAIChatEnabled, @@ -90,7 +85,6 @@ class BraveBrowserCommandControllerTest : public InProcessBrowserTest { EXPECT_EQ(ai_chat::IsAIChatEnabled(browser()->profile()->GetPrefs()), !value); } -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) void BlockVPNByPolicy(bool value) { @@ -256,9 +250,7 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_OPEN_GUEST_PROFILE)); EXPECT_TRUE( command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_WEBCOMPAT_REPORTER)); -#if BUILDFLAG(ENABLE_AI_CHAT) EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_TOGGLE_AI_CHAT)); -#endif } // Create guest browser and test its brave commands status. @@ -288,9 +280,7 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_OPEN_GUEST_PROFILE)); EXPECT_TRUE( command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_WEBCOMPAT_REPORTER)); -#if BUILDFLAG(ENABLE_AI_CHAT) EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_TOGGLE_AI_CHAT)); -#endif } // Launch tor window and check its command status. @@ -322,9 +312,7 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_OPEN_GUEST_PROFILE)); EXPECT_TRUE( command_controller->IsCommandEnabled(IDC_SHOW_BRAVE_WEBCOMPAT_REPORTER)); -#if BUILDFLAG(ENABLE_AI_CHAT) EXPECT_FALSE(command_controller->IsCommandEnabled(IDC_TOGGLE_AI_CHAT)); -#endif // Check tor commands when tor is disabled. TorProfileServiceFactory::SetTorDisabled(true); @@ -336,7 +324,6 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, ToggleAIChat_ControlledByPolicy) { auto* command_controller = browser()->command_controller(); @@ -350,7 +337,6 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, BlockAIChatByPolicy(false); EXPECT_TRUE(command_controller->IsCommandEnabled(IDC_TOGGLE_AI_CHAT)); } -#endif IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, BraveCommandsCloseTabsToLeft) { @@ -446,7 +432,7 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, } } -#if BUILDFLAG(ENABLE_AI_CHAT) && defined(TOOLKIT_VIEWS) +#if defined(TOOLKIT_VIEWS) IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, BraveCommandsToggleAIChat) { SidePanelEntryKey ai_chat_key = diff --git a/browser/ui/brave_pages.cc b/browser/ui/brave_pages.cc index 128d94ed103..81779b8b904 100644 --- a/browser/ui/brave_pages.cc +++ b/browser/ui/brave_pages.cc @@ -7,7 +7,7 @@ #include "base/strings/strcat.h" #include "brave/browser/ui/webui/webcompat_reporter/webcompat_reporter_dialog.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/sidebar/browser/constants.h" @@ -18,10 +18,6 @@ #include "chrome/common/webui_url_constants.h" #include "url/gurl.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif - namespace brave { void ShowBraveRewards(Browser* browser) { @@ -50,14 +46,12 @@ void ShowBraveTalk(Browser* browser) { ShowSingletonTabOverwritingNTP(browser, GURL(sidebar::kBraveTalkURL)); } -#if BUILDFLAG(ENABLE_AI_CHAT) void ShowFullpageChat(Browser* browser) { if (!ai_chat::features::IsAIChatHistoryEnabled()) { return; } ShowSingletonTabOverwritingNTP(browser, GURL(kChatUIURL)); } -#endif void ShowWebcompatReporter(Browser* browser) { content::WebContents* web_contents = diff --git a/browser/ui/brave_pages.h b/browser/ui/brave_pages.h index f335f9f6fa6..8fe518460d0 100644 --- a/browser/ui/brave_pages.h +++ b/browser/ui/brave_pages.h @@ -6,7 +6,6 @@ #ifndef BRAVE_BROWSER_UI_BRAVE_PAGES_H_ #define BRAVE_BROWSER_UI_BRAVE_PAGES_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom-forward.h" class Browser; @@ -26,10 +25,7 @@ void ShowSync(Browser* browser); void ShowBraveNewsConfigure(Browser* browser); void ShowShortcutsPage(Browser* browser); void ShowBraveTalk(Browser* browser); - -#if BUILDFLAG(ENABLE_AI_CHAT) void ShowFullpageChat(Browser* browser); -#endif } // namespace brave diff --git a/browser/ui/browser_commands.cc b/browser/ui/browser_commands.cc index 12a3b2fbbb4..aadd411b67b 100644 --- a/browser/ui/browser_commands.cc +++ b/browser/ui/browser_commands.cc @@ -227,7 +227,6 @@ void OpenBraveVPNUrls(Browser* browser, int command_id) { #endif } -#if BUILDFLAG(ENABLE_AI_CHAT) void ToggleAIChat(Browser* browser) { #if defined(TOOLKIT_VIEWS) SidePanelUI* side_panel_ui = browser->GetFeatures().side_panel_ui(); @@ -235,7 +234,6 @@ void ToggleAIChat(Browser* browser) { SidePanelOpenTrigger::kToolbarButton); #endif } -#endif void ShowWalletBubble(Browser* browser) { #if defined(TOOLKIT_VIEWS) diff --git a/browser/ui/browser_commands.h b/browser/ui/browser_commands.h index 502602b6d02..529b9884bcd 100644 --- a/browser/ui/browser_commands.h +++ b/browser/ui/browser_commands.h @@ -9,7 +9,6 @@ #include #include -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_wayback_machine/buildflags/buildflags.h" #include "brave/components/commander/common/buildflags/buildflags.h" #include "brave/components/playlist/common/buildflags/buildflags.h" @@ -28,9 +27,7 @@ void NewOffTheRecordWindowTor(Profile* profile); void NewTorConnectionForSite(Browser*); -#if BUILDFLAG(ENABLE_AI_CHAT) void ToggleAIChat(Browser* browser); -#endif void ShowWalletBubble(Browser* browser); void ShowApproveWalletBubble(Browser* browser); diff --git a/browser/ui/commander/simple_command_source.cc b/browser/ui/commander/simple_command_source.cc index 1662183d62d..8673cb4c4e9 100644 --- a/browser/ui/commander/simple_command_source.cc +++ b/browser/ui/commander/simple_command_source.cc @@ -12,35 +12,29 @@ #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" +#include "brave/app/brave_command_ids.h" #include "brave/app/command_utils.h" +#include "brave/browser/brave_browser_process.h" +#include "brave/browser/misc_metrics/process_misc_metrics.h" #include "brave/browser/ui/commander/command_source.h" #include "brave/browser/ui/commander/fuzzy_finder.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" #include "chrome/browser/ui/accelerator_utils.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "ui/base/accelerators/accelerator.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/app/brave_command_ids.h" -#include "brave/browser/brave_browser_process.h" -#include "brave/browser/misc_metrics/process_misc_metrics.h" -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#endif - namespace commander { namespace { void MaybeReportCommandExecution(int command_id) { -#if BUILDFLAG(ENABLE_AI_CHAT) if (command_id == IDC_TOGGLE_AI_CHAT) { ai_chat::AIChatMetrics* metrics = g_brave_browser_process->process_misc_metrics()->ai_chat_metrics(); CHECK(metrics); metrics->HandleOpenViaEntryPoint(ai_chat::EntryPoint::kOmniboxCommand); } -#endif } } // namespace diff --git a/browser/ui/omnibox/brave_omnibox_client_impl.cc b/browser/ui/omnibox/brave_omnibox_client_impl.cc index 8585258608a..7f0a12ae7b3 100644 --- a/browser/ui/omnibox/brave_omnibox_client_impl.cc +++ b/browser/ui/omnibox/brave_omnibox_client_impl.cc @@ -5,9 +5,13 @@ #include "brave/browser/ui/omnibox/brave_omnibox_client_impl.h" +#include "base/check_is_test.h" #include "base/values.h" #include "brave/browser/autocomplete/brave_autocomplete_scheme_classifier.h" +#include "brave/browser/brave_browser_process.h" +#include "brave/browser/misc_metrics/process_misc_metrics.h" #include "brave/browser/search_engines/search_engine_tracker.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" #include "brave/components/brave_search_conversion/p3a.h" #include "brave/components/brave_search_conversion/utils.h" #include "brave/components/constants/pref_names.h" @@ -23,13 +27,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "base/check_is_test.h" -#include "brave/browser/brave_browser_process.h" -#include "brave/browser/misc_metrics/process_misc_metrics.h" -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#endif - namespace { using brave_search_conversion::ConversionType; @@ -72,7 +69,7 @@ BraveOmniboxClientImpl::BraveOmniboxClientImpl(LocationBar* location_bar, search_storage_(profile_->GetPrefs(), kSearchCountPrefName) { // Record initial search count p3a value. RecordSearchEventP3A(search_storage_.GetWeeklySum()); -#if BUILDFLAG(ENABLE_AI_CHAT) + if (g_brave_browser_process->process_misc_metrics()) { ai_chat_metrics_ = g_brave_browser_process->process_misc_metrics()->ai_chat_metrics(); @@ -80,7 +77,6 @@ BraveOmniboxClientImpl::BraveOmniboxClientImpl(LocationBar* location_bar, } else { CHECK_IS_TEST(); } -#endif } BraveOmniboxClientImpl::~BraveOmniboxClientImpl() = default; @@ -126,11 +122,9 @@ void BraveOmniboxClientImpl::OnAutocompleteAccept( if (search_engine_tracker_ != nullptr) { search_engine_tracker_->RecordLocationBarQuery(); } -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat_metrics_) { ai_chat_metrics_->RecordOmniboxSearchQuery(); } -#endif } ChromeOmniboxClient::OnAutocompleteAccept( destination_url, post_content, disposition, transition, match_type, diff --git a/browser/ui/omnibox/brave_omnibox_client_impl.h b/browser/ui/omnibox/brave_omnibox_client_impl.h index 51a192d6143..f8239201935 100644 --- a/browser/ui/omnibox/brave_omnibox_client_impl.h +++ b/browser/ui/omnibox/brave_omnibox_client_impl.h @@ -15,11 +15,9 @@ class PrefRegistrySimple; class Profile; class SearchEngineTracker; -#if BUILDFLAG(ENABLE_AI_CHAT) namespace ai_chat { class AIChatMetrics; } // namespace ai_chat -#endif class BraveOmniboxClientImpl : public ChromeOmniboxClient { public: @@ -53,9 +51,7 @@ class BraveOmniboxClientImpl : public ChromeOmniboxClient { private: raw_ptr profile_ = nullptr; raw_ptr search_engine_tracker_ = nullptr; -#if BUILDFLAG(ENABLE_AI_CHAT) raw_ptr ai_chat_metrics_ = nullptr; -#endif BraveAutocompleteSchemeClassifier scheme_classifier_; WeeklyStorage search_storage_; }; diff --git a/browser/ui/sidebar/BUILD.gn b/browser/ui/sidebar/BUILD.gn index 4839cb14ec5..8c584eeb758 100644 --- a/browser/ui/sidebar/BUILD.gn +++ b/browser/ui/sidebar/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//build/config/ui.gni") import("//extensions/buildflags/buildflags.gni") @@ -21,7 +20,7 @@ source_set("browser_tests") { deps = [ "//base", "//brave/app:command_ids", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", "//brave/components/playlist/common", "//brave/components/sidebar/browser", "//brave/components/sidebar/common", @@ -38,10 +37,6 @@ source_set("browser_tests") { "//ui/events", "//ui/gfx", ] - - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common" ] - } } source_set("unit_tests") { @@ -52,7 +47,6 @@ source_set("unit_tests") { deps = [ "//base", "//brave/common", - "//brave/components/ai_chat/core/common/buildflags", "//brave/components/playlist/common", "//brave/components/sidebar/browser", "//chrome/browser/ui", diff --git a/browser/ui/sidebar/sidebar_browsertest.cc b/browser/ui/sidebar/sidebar_browsertest.cc index 031382a43a8..e319d4fc987 100644 --- a/browser/ui/sidebar/sidebar_browsertest.cc +++ b/browser/ui/sidebar/sidebar_browsertest.cc @@ -31,7 +31,7 @@ #include "brave/browser/ui/views/tabs/vertical_tab_utils.h" #include "brave/browser/ui/views/toolbar/brave_toolbar_view.h" #include "brave/browser/ui/views/toolbar/side_panel_button.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/constants/brave_switches.h" #include "brave/components/playlist/common/features.h" #include "brave/components/sidebar/browser/constants.h" @@ -63,10 +63,6 @@ #include "ui/events/event.h" #include "ui/gfx/geometry/point.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - using ::testing::Eq; using ::testing::Ne; using ::testing::Optional; @@ -193,14 +189,16 @@ class SidebarBrowserTest : public InProcessBrowserTest { } void WaitUntil(base::RepeatingCallback condition) { - if (condition.Run()) + if (condition.Run()) { return; + } base::RepeatingTimer scheduler; scheduler.Start(FROM_HERE, base::Milliseconds(100), base::BindLambdaForTesting([this, &condition] { - if (condition.Run()) + if (condition.Run()) { run_loop_->Quit(); + } })); Run(); } @@ -264,11 +262,10 @@ class SidebarBrowserTest : public InProcessBrowserTest { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) if (!ai_chat::features::IsAIChatEnabled()) { item_count -= 1; } -#endif + return item_count; } @@ -1015,13 +1012,11 @@ class SidebarBrowserTestWithkSidebarShowAlwaysOnStable IN_PROC_BROWSER_TEST_P(SidebarBrowserTestWithkSidebarShowAlwaysOnStable, SidebarShowAlwaysTest) { - auto* sidebar_service = SidebarServiceFactory::GetForProfile(browser()->profile()); EXPECT_EQ(SidebarService::ShowSidebarOption::kShowAlways, sidebar_service->GetSidebarShowOption()); -#if BUILDFLAG(ENABLE_AI_CHAT) observation_.Observe(model()); // Check one shot Leo panel is opened or not based on test parameter. @@ -1072,7 +1067,6 @@ IN_PROC_BROWSER_TEST_P(SidebarBrowserTestWithkSidebarShowAlwaysOnStable, testing::Mock::VerifyAndClearExpectations(&observer_); observation_.Reset(); -#endif } INSTANTIATE_TEST_SUITE_P( @@ -1119,7 +1113,6 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTestWithPlaylist, Incognito) { sidebar_service->RemoveItemAt(0); } -#if BUILDFLAG(ENABLE_AI_CHAT) class SidebarBrowserTestWithAIChat : public SidebarBrowserTest { public: SidebarBrowserTestWithAIChat() { @@ -1298,7 +1291,6 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTestWithAIChat, tab_model()->ActivateTabAt(2); EXPECT_EQ(model()->active_index(), new_global_item_index); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, SidebarRightSideTest) { // Sidebar is on right by default diff --git a/browser/ui/sidebar/sidebar_tab_helper.cc b/browser/ui/sidebar/sidebar_tab_helper.cc index 55107d37318..fe09a717017 100644 --- a/browser/ui/sidebar/sidebar_tab_helper.cc +++ b/browser/ui/sidebar/sidebar_tab_helper.cc @@ -6,7 +6,6 @@ #include "brave/browser/ui/sidebar/sidebar_tab_helper.h" #include "base/metrics/field_trial_params.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/sidebar/browser/pref_names.h" #include "brave/components/sidebar/common/features.h" #include "chrome/browser/browser_process.h" @@ -36,10 +35,6 @@ bool IsLeoPanelAlreadyOpened(content::WebContents* contents) { void SidebarTabHelper::MaybeCreateForWebContents( content::WebContents* contents) { // For now only used for one shot Leo panel open. -#if !BUILDFLAG(ENABLE_AI_CHAT) - return; -#endif - if (!g_browser_process || !g_browser_process->local_state()) { return; } diff --git a/browser/ui/sidebar/sidebar_unittest.cc b/browser/ui/sidebar/sidebar_unittest.cc index f68fac0f941..6abebbcabd0 100644 --- a/browser/ui/sidebar/sidebar_unittest.cc +++ b/browser/ui/sidebar/sidebar_unittest.cc @@ -12,7 +12,6 @@ #include "brave/browser/ui/sidebar/sidebar_model.h" #include "brave/browser/ui/sidebar/sidebar_service_factory.h" #include "brave/browser/ui/sidebar/sidebar_utils.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/playlist/common/buildflags/buildflags.h" #include "brave/components/sidebar/browser/constants.h" @@ -211,15 +210,9 @@ TEST_F(SidebarModelTest, ActiveIndexChangedAfterItemAdded) { // Check Leo item is top-most item. TEST_F(SidebarModelTest, TopItemTest) { -#if BUILDFLAG(ENABLE_AI_CHAT) const auto first_item = service()->items()[0]; EXPECT_EQ(first_item.built_in_item_type, SidebarItem::BuiltInItemType::kChatUI); -#else - const auto first_item = service()->items()[0]; - EXPECT_EQ(first_item.built_in_item_type, - SidebarItem::BuiltInItemType::kReadingList); -#endif } TEST(SidebarUtilTest, SidebarShowOptionsDefaultTest) { diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index ab16f5d3ca6..55855e7f684 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -15,7 +15,6 @@ #include "brave/app/brave_command_ids.h" #include "brave/browser/ui/brave_browser_command_controller.h" #include "brave/browser/ui/browser_commands.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/skus/common/features.h" #include "brave/components/tor/buildflags/buildflags.h" @@ -169,9 +168,7 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { #if BUILDFLAG(ENABLE_TOR) IDC_NEW_OFFTHERECORD_WINDOW_TOR, #endif -#if BUILDFLAG(ENABLE_AI_CHAT) IDC_TOGGLE_AI_CHAT, -#endif IDC_SHOW_BRAVE_WALLET, #if BUILDFLAG(ENABLE_BRAVE_VPN) IDC_SHOW_BRAVE_VPN_PANEL, @@ -292,9 +289,7 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { #if BUILDFLAG(ENABLE_TOR) IDC_NEW_OFFTHERECORD_WINDOW_TOR, #endif -#if BUILDFLAG(ENABLE_AI_CHAT) IDC_TOGGLE_AI_CHAT, -#endif IDC_SHOW_BRAVE_WALLET, #if BUILDFLAG(ENABLE_BRAVE_VPN) IDC_SHOW_BRAVE_VPN_PANEL, @@ -350,9 +345,7 @@ IN_PROC_BROWSER_TEST_F(BraveAppMenuModelBrowserTest, MenuOrderTest) { }; std::vector commands_disabled_for_tor_profile = { IDC_RECENT_TABS_MENU, -#if BUILDFLAG(ENABLE_AI_CHAT) IDC_TOGGLE_AI_CHAT, -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) IDC_SHOW_BRAVE_VPN_PANEL, #endif diff --git a/browser/ui/views/location_bar/brave_search_conversion/promotion_button_controller.cc b/browser/ui/views/location_bar/brave_search_conversion/promotion_button_controller.cc index ecbfc61570c..2bcdad81cd8 100644 --- a/browser/ui/views/location_bar/brave_search_conversion/promotion_button_controller.cc +++ b/browser/ui/views/location_bar/brave_search_conversion/promotion_button_controller.cc @@ -7,7 +7,6 @@ #include "base/functional/bind.h" #include "brave/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_search_conversion/features.h" #include "brave/components/brave_search_conversion/pref_names.h" #include "brave/components/brave_search_conversion/utils.h" @@ -141,9 +140,7 @@ bool PromotionButtonController::ShouldShowSearchPromotionButton() { const AutocompleteMatch match = omnibox_view_->model()->CurrentMatch(nullptr); return !IsBraveSearchPromotionMatch(match) && -#if BUILDFLAG(ENABLE_AI_CHAT) !LeoProvider::IsMatchFromLeoProvider(match) && -#endif AutocompleteMatch::IsSearchType(match.type); } diff --git a/browser/ui/views/omnibox/brave_omnibox_result_view.cc b/browser/ui/views/omnibox/brave_omnibox_result_view.cc index a0067bfb5ee..c615abf6f00 100644 --- a/browser/ui/views/omnibox/brave_omnibox_result_view.cc +++ b/browser/ui/views/omnibox/brave_omnibox_result_view.cc @@ -11,7 +11,7 @@ #include "brave/browser/ui/color/brave_color_id.h" #include "brave/browser/ui/views/omnibox/brave_omnibox_popup_view_views.h" #include "brave/browser/ui/views/omnibox/brave_search_conversion_promotion_view.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/omnibox/browser/leo_provider.h" #include "brave/components/omnibox/browser/promotion_utils.h" #include "brave/grit/brave_theme_resources.h" #include "chrome/browser/browser_process.h" @@ -34,10 +34,6 @@ #include "ui/views/layout/flex_layout.h" #include "ui/views/view_class_properties.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/omnibox/browser/leo_provider.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - BraveOmniboxResultView::~BraveOmniboxResultView() = default; void BraveOmniboxResultView::ResetChildren() { @@ -60,10 +56,7 @@ void BraveOmniboxResultView::SetMatch(const AutocompleteMatch& match) { OmniboxResultView::SetMatch(match); UpdateForBraveSearchConversion(); - -#if BUILDFLAG(ENABLE_AI_CHAT) UpdateForLeoMatch(); -#endif } void BraveOmniboxResultView::OnSelectionStateChanged() { @@ -73,23 +66,18 @@ void BraveOmniboxResultView::OnSelectionStateChanged() { } gfx::Image BraveOmniboxResultView::GetIcon() const { -#if BUILDFLAG(ENABLE_AI_CHAT) if (LeoProvider::IsMatchFromLeoProvider(match_)) { // As Leo icon has gradient color, we can't use vector icon because it lacks // of gradient color. return ui::ResourceBundle::GetSharedInstance().GetImageNamed( IDR_LEO_FAVICON); } -#endif return OmniboxResultView::GetIcon(); } void BraveOmniboxResultView::OnThemeChanged() { OmniboxResultView::OnThemeChanged(); - -#if BUILDFLAG(ENABLE_AI_CHAT) UpdateForLeoMatch(); -#endif } void BraveOmniboxResultView::OpenMatch() { @@ -145,7 +133,6 @@ void BraveOmniboxResultView::UpdateForBraveSearchConversion() { HandleSelectionStateChangedForPromotionView(); } -#if BUILDFLAG(ENABLE_AI_CHAT) void BraveOmniboxResultView::UpdateForLeoMatch() { if (LeoProvider::IsMatchFromLeoProvider(match_)) { constexpr int kLeoMatchPadding = 4; @@ -162,16 +149,13 @@ void BraveOmniboxResultView::UpdateForLeoMatch() { SetBorder(nullptr); } } -#endif void BraveOmniboxResultView::OnPaintBackground(gfx::Canvas* canvas) { -#if BUILDFLAG(ENABLE_AI_CHAT) gfx::ScopedCanvas scoped_canvas(canvas); if (LeoProvider::IsMatchFromLeoProvider(match_)) { // Clip upper padding canvas->ClipRect(GetContentsBounds()); } -#endif OmniboxResultView::OnPaintBackground(canvas); } diff --git a/browser/ui/views/omnibox/brave_omnibox_result_view.h b/browser/ui/views/omnibox/brave_omnibox_result_view.h index 226a008e480..f6b338e9062 100644 --- a/browser/ui/views/omnibox/brave_omnibox_result_view.h +++ b/browser/ui/views/omnibox/brave_omnibox_result_view.h @@ -7,7 +7,6 @@ #define BRAVE_BROWSER_UI_VIEWS_OMNIBOX_BRAVE_OMNIBOX_RESULT_VIEW_H_ #include "base/memory/raw_ptr.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" #include "ui/base/metadata/metadata_header_macros.h" @@ -39,10 +38,7 @@ class BraveOmniboxResultView : public OmniboxResultView { void ResetChildren(); void UpdateForBraveSearchConversion(); void HandleSelectionStateChangedForPromotionView(); - -#if BUILDFLAG(ENABLE_AI_CHAT) void UpdateForLeoMatch(); -#endif // BUILDFLAG(ENABLE_AI_CHAT) // Brave search conversion promotion raw_ptr brave_search_promotion_view_ = diff --git a/browser/ui/views/side_panel/brave_side_panel_utils.cc b/browser/ui/views/side_panel/brave_side_panel_utils.cc index 5884353c7ce..6f5ca41b4cf 100644 --- a/browser/ui/views/side_panel/brave_side_panel_utils.cc +++ b/browser/ui/views/side_panel/brave_side_panel_utils.cc @@ -3,7 +3,8 @@ * 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/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/constants/webui_url_constants.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/side_panel/side_panel_registry.h" @@ -13,18 +14,12 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" -#include "brave/components/ai_chat/core/browser/utils.h" -#endif - using SidePanelWebUIViewT_AIChatUI = SidePanelWebUIViewT; BEGIN_TEMPLATE_METADATA(SidePanelWebUIViewT_AIChatUI, SidePanelWebUIViewT) END_METADATA namespace { -#if BUILDFLAG(ENABLE_AI_CHAT) std::unique_ptr CreateAIChatSidePanelWebView( base::WeakPtr profile) { if (!profile) { @@ -40,7 +35,6 @@ std::unique_ptr CreateAIChatSidePanelWebView( web_view->ShowUI(); return web_view; } -#endif } // namespace @@ -51,7 +45,6 @@ namespace brave { // registering it. void RegisterContextualSidePanel(SidePanelRegistry* registry, content::WebContents* web_contents) { -#if BUILDFLAG(ENABLE_AI_CHAT) content::BrowserContext* context = web_contents->GetBrowserContext(); if (ai_chat::IsAIChatEnabled(user_prefs::UserPrefs::Get(context)) && Profile::FromBrowserContext(context)->IsRegularProfile()) { @@ -62,7 +55,6 @@ void RegisterContextualSidePanel(SidePanelRegistry* registry, &CreateAIChatSidePanelWebView, Profile::FromBrowserContext(context)->GetWeakPtr()))); } -#endif } } // namespace brave diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc index 7df76c65fad..f17fdb1f1c1 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc @@ -28,7 +28,8 @@ #include "brave/browser/ui/views/sidebar/sidebar_edit_item_bubble_delegate_view.h" #include "brave/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.h" #include "brave/browser/ui/views/sidebar/sidebar_item_view.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/l10n/common/localization_util.h" #include "brave/components/playlist/common/features.h" #include "brave/components/sidebar/browser/pref_names.h" @@ -57,11 +58,6 @@ #include "ui/views/controls/separator.h" #include "ui/views/layout/box_layout.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#include "brave/components/ai_chat/core/common/features.h" -#endif - namespace { constexpr gfx::Size kIconSize(SidebarButtonView::kExternalIconSize, @@ -521,7 +517,6 @@ void SidebarItemsContentsView::OnItemPressed(const views::View* item, const auto& item_model = controller->model()->GetAllSidebarItems()[*index]; if (item_model.open_in_panel) { -#if BUILDFLAG(ENABLE_AI_CHAT) if (item_model.built_in_item_type == sidebar::SidebarItem::BuiltInItemType::kChatUI) { ai_chat::AIChatMetrics* metrics = @@ -529,7 +524,6 @@ void SidebarItemsContentsView::OnItemPressed(const views::View* item, CHECK(metrics); metrics->HandleOpenViaEntryPoint(ai_chat::EntryPoint::kSidebar); } -#endif controller->ActivatePanelItem(item_model.built_in_item_type); return; } diff --git a/browser/ui/views/toolbar/brave_app_menu.cc b/browser/ui/views/toolbar/brave_app_menu.cc index f8473de94c3..9b33bd3fd5e 100644 --- a/browser/ui/views/toolbar/brave_app_menu.cc +++ b/browser/ui/views/toolbar/brave_app_menu.cc @@ -17,6 +17,7 @@ #include "brave/browser/ui/color/brave_color_id.h" #include "brave/browser/ui/sidebar/sidebar_service_factory.h" #include "brave/browser/ui/toolbar/brave_app_menu_model.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/misc_metrics/menu_metrics.h" #include "brave/components/sidebar/browser/sidebar_service.h" @@ -43,10 +44,6 @@ #include "brave/browser/ui/views/toolbar/brave_vpn_toggle_button.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#endif - using views::MenuItemView; namespace { @@ -217,14 +214,12 @@ void BraveAppMenu::OnMenuClosed(views::MenuItemView* menu) { void BraveAppMenu::RecordMenuUsage(int command_id) { misc_metrics::MenuGroup group; -#if BUILDFLAG(ENABLE_AI_CHAT) if (command_id == IDC_TOGGLE_AI_CHAT) { ai_chat::AIChatMetrics* metrics = g_brave_browser_process->process_misc_metrics()->ai_chat_metrics(); CHECK(metrics); metrics->HandleOpenViaEntryPoint(ai_chat::EntryPoint::kMenuItem); } -#endif switch (command_id) { case IDC_NEW_WINDOW: diff --git a/browser/ui/views/toolbar/brave_toolbar_view.cc b/browser/ui/views/toolbar/brave_toolbar_view.cc index 446bada850c..fe6b674f553 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view.cc @@ -11,13 +11,15 @@ #include "base/functional/bind.h" #include "brave/app/brave_command_ids.h" +#include "brave/browser/ai_chat/ai_chat_utils.h" #include "brave/browser/brave_wallet/brave_wallet_context_utils.h" #include "brave/browser/ui/tabs/brave_tab_prefs.h" #include "brave/browser/ui/views/tabs/vertical_tab_utils.h" +#include "brave/browser/ui/views/toolbar/ai_chat_button.h" #include "brave/browser/ui/views/toolbar/bookmark_button.h" #include "brave/browser/ui/views/toolbar/side_panel_button.h" #include "brave/browser/ui/views/toolbar/wallet_button.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/common/common_utils.h" @@ -42,12 +44,6 @@ #include "ui/events/event.h" #include "ui/views/window/hit_test_utils.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ai_chat/ai_chat_utils.h" -#include "brave/browser/ui/views/toolbar/ai_chat_button.h" -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/browser/brave_vpn/brave_vpn_service_factory.h" #include "brave/browser/ui/views/toolbar/brave_vpn_button.h" @@ -63,12 +59,13 @@ constexpr int kLocationBarMaxWidth = 1080; double GetLocationBarMarginHPercent(int toolbar_width) { double location_bar_margin_h_pc = 0.07; - if (toolbar_width < 700) + if (toolbar_width < 700) { location_bar_margin_h_pc = 0; - else if (toolbar_width < 850) + } else if (toolbar_width < 850) { location_bar_margin_h_pc = 0.03; - else if (toolbar_width < 1000) + } else if (toolbar_width < 1000) { location_bar_margin_h_pc = 0.05; + } return location_bar_margin_h_pc; } @@ -244,7 +241,6 @@ void BraveToolbarView::Init() { UpdateWalletButtonVisibility(); -#if BUILDFLAG(ENABLE_AI_CHAT) // Don't check policy status since we're going to // setup a watcher for policy pref. if (ai_chat::IsAllowedForContext(browser_->profile(), false)) { @@ -262,7 +258,6 @@ void BraveToolbarView::Init() { base::Unretained(this))); UpdateAIChatButtonVisibility(); } -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) if (brave_vpn::BraveVpnServiceFactory::GetForProfile(profile)) { @@ -318,8 +313,9 @@ void BraveToolbarView::OnEditBookmarksEnabledChanged() { } void BraveToolbarView::OnShowBookmarksButtonChanged() { - if (!bookmark_) + if (!bookmark_) { return; + } UpdateBookmarkVisibility(); } @@ -334,13 +330,16 @@ void BraveToolbarView::OnLocationBarIsWideChanged() { void BraveToolbarView::OnThemeChanged() { ToolbarView::OnThemeChanged(); - if (!brave_initialized_) + if (!brave_initialized_) { return; + } - if (display_mode_ == DisplayMode::NORMAL && bookmark_) + if (display_mode_ == DisplayMode::NORMAL && bookmark_) { bookmark_->UpdateImageAndText(); - if (display_mode_ == DisplayMode::NORMAL && wallet_) + } + if (display_mode_ == DisplayMode::NORMAL && wallet_) { wallet_->UpdateImageAndText(); + } } views::View* BraveToolbarView::GetAnchorView( @@ -359,10 +358,12 @@ void BraveToolbarView::OnProfileWasRemoved(const base::FilePath& profile_path, void BraveToolbarView::LoadImages() { ToolbarView::LoadImages(); - if (bookmark_) + if (bookmark_) { bookmark_->UpdateImageAndText(); - if (wallet_) + } + if (wallet_) { wallet_->UpdateImageAndText(); + } } void BraveToolbarView::Update(content::WebContents* tab) { @@ -383,8 +384,9 @@ void BraveToolbarView::Update(content::WebContents* tab) { } void BraveToolbarView::UpdateBookmarkVisibility() { - if (!bookmark_) + if (!bookmark_) { return; + } DCHECK_EQ(DisplayMode::NORMAL, display_mode_); bookmark_->SetVisible(browser_defaults::bookmarks_enabled && @@ -420,8 +422,9 @@ void BraveToolbarView::ShowBookmarkBubble(const GURL& url, // or the location bar if there is no bookmark button // (i.e. in non-normal display mode). views::View* anchor_view = location_bar_; - if (bookmark_ && bookmark_->GetVisible()) + if (bookmark_ && bookmark_->GetVisible()) { anchor_view = bookmark_; + } std::unique_ptr delegate; delegate = @@ -450,8 +453,9 @@ void BraveToolbarView::ViewHierarchyChanged( void BraveToolbarView::Layout(PassKey) { LayoutSuperclass(this); - if (!brave_initialized_) + if (!brave_initialized_) { return; + } // ToolbarView::Layout() handles below modes. So just return. if (display_mode_ == DisplayMode::CUSTOM_TAB || @@ -491,13 +495,11 @@ void BraveToolbarView::ResetButtonBounds() { } } -#if BUILDFLAG(ENABLE_AI_CHAT) void BraveToolbarView::UpdateAIChatButtonVisibility() { bool should_show = ai_chat::IsAllowedForContext(browser()->profile()) && show_ai_chat_button_.GetValue(); ai_chat_button_->SetVisible(should_show); } -#endif void BraveToolbarView::UpdateWalletButtonVisibility() { Profile* profile = browser()->profile(); diff --git a/browser/ui/views/toolbar/brave_toolbar_view.h b/browser/ui/views/toolbar/brave_toolbar_view.h index 497f0fcede6..90a608fef09 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view.h +++ b/browser/ui/views/toolbar/brave_toolbar_view.h @@ -8,16 +8,13 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "components/prefs/pref_member.h" #include "ui/base/metadata/metadata_header_macros.h" -#if BUILDFLAG(ENABLE_AI_CHAT) class AIChatButton; -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) class BraveVPNButton; @@ -37,10 +34,7 @@ class BraveToolbarView : public ToolbarView, BraveBookmarkButton* bookmark_button() const { return bookmark_; } WalletButton* wallet_button() const { return wallet_; } SidePanelButton* side_panel_button() const { return side_panel_; } - -#if BUILDFLAG(ENABLE_AI_CHAT) AIChatButton* ai_chat_button() const { return ai_chat_button_; } -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) BraveVPNButton* brave_vpn_button() const { return brave_vpn_; } @@ -77,10 +71,7 @@ class BraveToolbarView : public ToolbarView, void OnProfileWasRemoved(const base::FilePath& profile_path, const std::u16string& profile_name) override; -#if BUILDFLAG(ENABLE_AI_CHAT) void UpdateAIChatButtonVisibility(); -#endif - void UpdateWalletButtonVisibility(); views::View* toolbar_divider_for_testing() { return toolbar_divider_; } @@ -100,11 +91,9 @@ class BraveToolbarView : public ToolbarView, BooleanPrefMember show_bookmarks_button_; -#if BUILDFLAG(ENABLE_AI_CHAT) raw_ptr ai_chat_button_ = nullptr; BooleanPrefMember show_ai_chat_button_; BooleanPrefMember hide_ai_chat_button_by_policy_; -#endif BooleanPrefMember show_wallet_button_; BooleanPrefMember wallet_private_window_enabled_; diff --git a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc index 972363f79ec..7e3e1d17da2 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc @@ -9,9 +9,12 @@ #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "brave/browser/ui/views/frame/brave_browser_view.h" +#include "brave/browser/ui/views/toolbar/ai_chat_button.h" #include "brave/browser/ui/views/toolbar/bookmark_button.h" #include "brave/browser/ui/views/toolbar/wallet_button.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" +#include "brave/components/ai_chat/core/common/features.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/constants/pref_names.h" #include "brave/components/skus/common/features.h" @@ -42,13 +45,6 @@ #include "content/public/test/test_utils.h" #include "ui/views/view.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ui/views/toolbar/ai_chat_button.h" -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/features.h" -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif - #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/browser/ui/views/toolbar/brave_vpn_button.h" #include "brave/components/brave_vpn/common/brave_vpn_utils.h" @@ -87,7 +83,6 @@ class BraveToolbarViewTest : public InProcessBrowserTest { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) void BlockAIChatByPolicy(bool value) { policy::PolicyMap policies; policies.Set(policy::key::kBraveAIChatEnabled, @@ -97,7 +92,6 @@ class BraveToolbarViewTest : public InProcessBrowserTest { EXPECT_EQ(ai_chat::IsAIChatEnabled(browser()->profile()->GetPrefs()), !value); } -#endif void Init(Browser* browser) { BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); @@ -130,7 +124,6 @@ class BraveToolbarViewTest : public InProcessBrowserTest { return wallet_button->GetVisible(); } -#if BUILDFLAG(ENABLE_AI_CHAT) bool is_ai_chat_button_shown(Browser* browser) { BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); toolbar_view_ = static_cast(browser_view->toolbar()); @@ -140,15 +133,11 @@ class BraveToolbarViewTest : public InProcessBrowserTest { } return button->GetVisible(); } -#endif raw_ptr toolbar_button_provider_ = nullptr; raw_ptr toolbar_view_ = nullptr; - -#if BUILDFLAG(ENABLE_BRAVE_VPN) || BUILDFLAG(ENABLE_AI_CHAT) testing::NiceMock provider_; -#endif }; #if BUILDFLAG(ENABLE_BRAVE_VPN) @@ -168,7 +157,6 @@ class BraveToolbarViewTest_VPNEnabled : public BraveToolbarViewTest { }; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) class BraveToolbarViewTest_AIChatEnabled : public BraveToolbarViewTest { public: BraveToolbarViewTest_AIChatEnabled() { @@ -188,7 +176,6 @@ class BraveToolbarViewTest_AIChatDisabled : public BraveToolbarViewTest { protected: base::test::ScopedFeatureList scoped_feature_list_; }; -#endif #if BUILDFLAG(ENABLE_BRAVE_VPN) IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest_VPNEnabled, VPNButtonVisibility) { @@ -220,7 +207,6 @@ IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest_VPNEnabled, VPNButtonVisibility) { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest_AIChatEnabled, AIChatButtonVisibility) { auto* prefs = browser()->profile()->GetPrefs(); @@ -276,7 +262,6 @@ IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest_AIChatDisabled, // Button is always hidden when feature flag is disabled EXPECT_FALSE(is_ai_chat_button_shown(browser())); } -#endif IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest, ToolbarDividerNotShownTest) { // As we don't use divider in toolbar, it should be null always. diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc index c81298d8861..8c1c6543e30 100644 --- a/browser/ui/webui/brave_settings_ui.cc +++ b/browser/ui/webui/brave_settings_ui.cc @@ -30,10 +30,12 @@ #include "brave/browser/ui/webui/settings/brave_appearance_handler.h" #include "brave/browser/ui/webui/settings/brave_default_extensions_handler.h" #include "brave/browser/ui/webui/settings/brave_privacy_handler.h" +#include "brave/browser/ui/webui/settings/brave_settings_leo_assistant_handler.h" #include "brave/browser/ui/webui/settings/brave_sync_handler.h" #include "brave/browser/ui/webui/settings/brave_wallet_handler.h" #include "brave/browser/ui/webui/settings/default_brave_shields_handler.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/brave_vpn/common/features.h" #include "brave/components/brave_wallet/common/features.h" @@ -81,12 +83,6 @@ #include "brave/browser/ui/webui/settings/brave_tor_snowflake_extension_handler.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ui/webui/settings/brave_settings_leo_assistant_handler.h" -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/features.h" -#endif - #if BUILDFLAG(ENABLE_PLAYLIST) #include "brave/components/playlist/common/features.h" #endif @@ -196,15 +192,10 @@ void BraveSettingsUI::AddResources(content::WebUIDataSource* html_source, html_source->AddBoolean("extensionsManifestV2Feature", base::FeatureList::IsEnabled(kExtensionsManifestV2)); -#if BUILDFLAG(ENABLE_AI_CHAT) html_source->AddBoolean("isLeoAssistantAllowed", ai_chat::IsAIChatEnabled(profile->GetPrefs())); html_source->AddBoolean("isLeoAssistantHistoryAllowed", ai_chat::features::IsAIChatHistoryEnabled()); -#else - html_source->AddBoolean("isLeoAssistantAllowed", false); - html_source->AddBoolean("isLeoAssistantHistoryAllowed", false); -#endif #if BUILDFLAG(ENABLE_PLAYLIST) html_source->AddBoolean( @@ -237,11 +228,9 @@ void BraveSettingsUI::BindInterface( void BraveSettingsUI::BindInterface( mojo::PendingReceiver pending_receiver) { -#if BUILDFLAG(ENABLE_AI_CHAT) auto assistant_handler = std::make_unique( std::make_unique( web_ui()->GetWebContents()->GetBrowserContext())); assistant_handler->BindInterface(std::move(pending_receiver)); web_ui()->AddMessageHandler(std::move(assistant_handler)); -#endif } diff --git a/browser/ui/webui/settings/brave_privacy_handler.cc b/browser/ui/webui/settings/brave_privacy_handler.cc index b7ffe98637f..cb24a80ba18 100644 --- a/browser/ui/webui/settings/brave_privacy_handler.cc +++ b/browser/ui/webui/settings/brave_privacy_handler.cc @@ -7,7 +7,8 @@ #include "base/functional/bind.h" #include "base/values.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_shields/core/common/features.h" #include "brave/components/constants/pref_names.h" #include "brave/components/de_amp/common/features.h" @@ -23,11 +24,6 @@ #include "content/public/browser/web_ui_data_source.h" #include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/features.h" -#endif - #if BUILDFLAG(ENABLE_REQUEST_OTR) #include "brave/components/request_otr/common/features.h" #endif @@ -104,12 +100,8 @@ void BravePrivacyHandler::AddLoadTimeData(content::WebUIDataSource* data_source, brave_shields::features::kBraveLocalhostAccessPermission)); data_source->AddBoolean( "isOpenAIChatFromBraveSearchEnabled", -#if BUILDFLAG(ENABLE_AI_CHAT) ai_chat::IsAIChatEnabled(profile->GetPrefs()) && ai_chat::features::IsOpenAIChatFromBraveSearchEnabled()); -#else - false); -#endif } void BravePrivacyHandler::SetLocalStateBooleanEnabled( diff --git a/browser/ui/webui/skus_internals_ui.cc b/browser/ui/webui/skus_internals_ui.cc index 14809bc17c9..86b20fe6d5b 100644 --- a/browser/ui/webui/skus_internals_ui.cc +++ b/browser/ui/webui/skus_internals_ui.cc @@ -19,7 +19,6 @@ #include "brave/browser/brave_browser_process.h" #include "brave/browser/skus/skus_service_factory.h" #include "brave/browser/ui/webui/brave_webui_source.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/skus/browser/pref_names.h" #include "brave/components/skus/browser/resources/grit/skus_internals_generated_map.h" @@ -112,9 +111,7 @@ void SkusInternalsUI::GetVpnState(GetVpnStateCallback callback) { void SkusInternalsUI::GetLeoState(GetLeoStateCallback callback) { base::Value::Dict dict; -#if BUILDFLAG(ENABLE_AI_CHAT) dict.Set("Order", GetOrderInfo("leo.")); -#endif std::string result; base::JSONWriter::Write(dict, &result); std::move(callback).Run(result); diff --git a/browser/ui/webui/speedreader/speedreader_toolbar_data_handler_impl.cc b/browser/ui/webui/speedreader/speedreader_toolbar_data_handler_impl.cc index 910aaad3b2a..e8686bc6e57 100644 --- a/browser/ui/webui/speedreader/speedreader_toolbar_data_handler_impl.cc +++ b/browser/ui/webui/speedreader/speedreader_toolbar_data_handler_impl.cc @@ -15,7 +15,7 @@ #include "brave/browser/ui/brave_browser.h" #include "brave/browser/ui/brave_browser_window.h" #include "brave/browser/ui/color/brave_color_id.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/speedreader/tts_player.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" @@ -25,14 +25,10 @@ #include "chrome/browser/ui/browser_window/public/browser_window_features.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/browser/ui/views/side_panel/side_panel_ui.h" #include "chrome/common/chrome_isolated_world_ids.h" #include "ui/color/color_provider.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#include "chrome/browser/ui/views/side_panel/side_panel_ui.h" -#endif - namespace { class TtsPlayerDelegate : public speedreader::TtsPlayer::Delegate { public: @@ -147,7 +143,6 @@ void SpeedreaderToolbarDataHandlerImpl::ViewOriginal() { } void SpeedreaderToolbarDataHandlerImpl::AiChat() { -#if BUILDFLAG(ENABLE_AI_CHAT) if (!browser_ || !ai_chat::IsAIChatEnabled(browser_->profile()->GetPrefs()) || !browser_->profile()->IsRegularProfile()) { return; @@ -163,7 +158,6 @@ void SpeedreaderToolbarDataHandlerImpl::AiChat() { } else { side_panel->Show(SidePanelEntryId::kChatUI); } -#endif } void SpeedreaderToolbarDataHandlerImpl::GetPlaybackState( diff --git a/browser/ui/webui/speedreader/speedreader_toolbar_ui.cc b/browser/ui/webui/speedreader/speedreader_toolbar_ui.cc index 80d16ce9792..ddcc8819904 100644 --- a/browser/ui/webui/speedreader/speedreader_toolbar_ui.cc +++ b/browser/ui/webui/speedreader/speedreader_toolbar_ui.cc @@ -8,7 +8,7 @@ #include #include "brave/browser/ui/webui/brave_webui_source.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/l10n/common/localization_util.h" #include "brave/components/speedreader/common/constants.h" @@ -24,10 +24,6 @@ #include "content/public/browser/web_ui_data_source.h" #include "content/public/common/url_constants.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#endif - SpeedreaderToolbarUI::SpeedreaderToolbarUI(content::WebUI* web_ui) : TopChromeWebUIController(web_ui, true), profile_(Profile::FromWebUI(web_ui)) { @@ -47,13 +43,10 @@ SpeedreaderToolbarUI::SpeedreaderToolbarUI(content::WebUI* web_ui) source->AddString(str.name, l10n_str); } -#if BUILDFLAG(ENABLE_AI_CHAT) source->AddBoolean("aiChatFeatureEnabled", ai_chat::IsAIChatEnabled(profile_->GetPrefs()) && profile_->IsRegularProfile()); -#else - source->AddBoolean("aiChatFeatureEnabled", false); -#endif + source->AddBoolean("ttsEnabled", speedreader::features::IsSpeedreaderEnabled() && speedreader::kSpeedreaderTTS.Get()); diff --git a/build/android/java/templates/BraveConfig.template b/build/android/java/templates/BraveConfig.template index 025d376ef27..c8fda535448 100644 --- a/build/android/java/templates/BraveConfig.template +++ b/build/android/java/templates/BraveConfig.template @@ -11,6 +11,5 @@ package org.chromium.chrome.browser; public class BraveConfig { public static final String DEVELOPER_OPTIONS_CODE = BRAVE_ANDROID_DEVELOPER_OPTIONS_CODE; public static final boolean P3A_ENABLED = BRAVE_ANDROID_P3A_ENABLED; - public static final boolean AI_CHAT_ENABLED = BRAVE_ANDROID_AI_CHAT_ENABLED; public static final String WEBCOMPAT_REPORT_ENDPOINT = BRAVE_ANDROID_WEBCOMPAT_REPORT_ENDPOINT; } diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni index 47afa501247..92c1836765f 100644 --- a/build/config/brave_build.gni +++ b/build/config/brave_build.gni @@ -15,7 +15,6 @@ import("//brave/browser/resources/history/sources.gni") import("//brave/browser/resources/settings/sources.gni") import("//brave/browser/ui/color/sources.gni") import("//brave/build/mac/config.gni") -import("//brave/components/browsing_data/core/sources.gni") import("//brave/components/content_settings/core/browser/sources.gni") import("//brave/components/omnibox/browser/sources.gni") import("//brave/components/search_engines/sources.gni") diff --git a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc index d54c351aad9..14f31031dd2 100644 --- a/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chromium_src/chrome/browser/android/browsing_data/browsing_data_bridge.cc @@ -3,20 +3,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" - -#if !BUILDFLAG(ENABLE_AI_CHAT) -#define BRAVE_CLEAR_BROWSING_DATA \ - remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; \ - break; -#else // BUILDFLAG(ENABLE_AI_CHAT) #define BRAVE_CLEAR_BROWSING_DATA \ remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; \ break; \ case browsing_data::BrowsingDataType::BRAVE_AI_CHAT: \ remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \ break; -#endif // BUILDFLAG(ENABLE_AI_CHAT) #include "src/chrome/browser/android/browsing_data/browsing_data_bridge.cc" #undef BRAVE_CLEAR_BROWSING_DATA diff --git a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc index 2397611db5a..daffe4578ad 100644 --- a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc @@ -5,6 +5,11 @@ #include "src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc" +#include "brave/browser/ai_chat/ai_chat_service_factory.h" +#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" +#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" +#include "brave/components/ai_chat/core/browser/ai_chat_service.h" +#include "brave/components/ai_chat/core/common/pref_names.h" #include "brave/components/commander/common/buildflags/buildflags.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" @@ -22,14 +27,6 @@ #include "brave/components/commander/browser/commander_frontend_delegate.h" #endif // BUILDFLAG(ENABLE_COMMANDER) -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ai_chat/ai_chat_service_factory.h" -#include "brave/components/ai_chat/content/browser/ai_chat_tab_helper.h" -#include "brave/components/ai_chat/core/browser/ai_chat_metrics.h" -#include "brave/components/ai_chat/core/browser/ai_chat_service.h" -#include "brave/components/ai_chat/core/common/pref_names.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if BUILDFLAG(ENABLE_COMMANDER) commander::CommanderFrontendDelegate* ChromeAutocompleteProviderClient::GetCommanderDelegate() { @@ -37,7 +34,6 @@ ChromeAutocompleteProviderClient::GetCommanderDelegate() { } #endif // BUILDFLAG(ENABLE_COMMANDER) -#if BUILDFLAG(ENABLE_AI_CHAT) void ChromeAutocompleteProviderClient::OpenLeo(const std::u16string& query) { #if !BUILDFLAG(IS_ANDROID) ai_chat::AIChatService* ai_chat_service = @@ -110,8 +106,6 @@ bool ChromeAutocompleteProviderClient::IsLeoProviderEnabled() { #endif } -#endif // BUILDFLAG(ENABLE_AI_CHAT) - std::u16string ChromeAutocompleteProviderClient::GetClipboardText() const { #if !BUILDFLAG(IS_ANDROID) return ::GetClipboardText(/*notify_if_restricted*/ false); diff --git a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h index 287f5dbe783..52a72e29e43 100644 --- a/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h +++ b/chromium_src/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h @@ -16,12 +16,10 @@ commander::CommanderFrontendDelegate* GetCommanderDelegate #endif // BUILDFLAG(ENABLE_COMMANDER) -#if BUILDFLAG(ENABLE_AI_CHAT) #define GetInMemoryDatabase \ GetInMemoryDatabase() override; \ void OpenLeo(const std::u16string& query) override; \ bool IsLeoProviderEnabled -#endif // BUILDFLAG(ENABLE_AI_CHAT) #define GetAcceptLanguages \ GetAcceptLanguages() const override; \ diff --git a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h index c477ec0729a..cc5db456538 100644 --- a/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h +++ b/chromium_src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h @@ -6,8 +6,6 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" - #include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h" // IWYU pragma: export namespace chrome_browsing_data_remover { @@ -15,9 +13,8 @@ constexpr DataType GetBraveDataTypeValue(const int index) { return DataType(1) << (63 - index); } -#if BUILDFLAG(ENABLE_AI_CHAT) constexpr DataType DATA_TYPE_BRAVE_LEO_HISTORY = GetBraveDataTypeValue(0); -#endif // BUILDFLAG(ENABLE_AI_CHAT) + } // namespace chrome_browsing_data_remover #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_CONSTANTS_H_ diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index 9d9be4cbc04..71d43207d27 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -6,7 +6,7 @@ #include "base/feature_override.h" #include "brave/browser/android/background_video/features.h" #include "brave/browser/android/safe_browsing/features.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_news/common/features.h" #include "brave/components/brave_rewards/common/features.h" #include "brave/components/brave_search_conversion/features.h" @@ -22,12 +22,7 @@ #include "net/base/features.h" #include "third_party/blink/public/common/features.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" #define BRAVE_AI_CHAT_FLAG &ai_chat::features::kAIChat, -#else -#define BRAVE_AI_CHAT_FLAG -#endif // clang-format off #define kForceWebContentsDarkMode kForceWebContentsDarkMode, \ diff --git a/chromium_src/chrome/browser/prefs/browser_prefs.cc b/chromium_src/chrome/browser/prefs/browser_prefs.cc index 5a1311894dd..4711618e350 100644 --- a/chromium_src/chrome/browser/prefs/browser_prefs.cc +++ b/chromium_src/chrome/browser/prefs/browser_prefs.cc @@ -11,7 +11,7 @@ #include "brave/browser/search/ntp_utils.h" #include "brave/browser/themes/brave_dark_mode_utils.h" #include "brave/browser/translate/brave_translate_prefs_migration.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/model_service.h" #include "brave/components/brave_adaptive_captcha/prefs_util.h" #include "brave/components/brave_ads/core/public/prefs/obsolete_pref_util.h" #include "brave/components/brave_news/browser/brave_news_p3a.h" @@ -80,10 +80,6 @@ #include "brave/components/sidebar/browser/pref_names.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/model_service.h" -#endif - // This method should be periodically pruned of year+ old migrations. void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, const base::FilePath& profile_path) { @@ -188,10 +184,8 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, brave_tabs::MigrateBraveProfilePrefs(profile_prefs); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(ENABLE_AI_CHAT) // Added 2024-04 ai_chat::ModelService::MigrateProfilePrefs(profile_prefs); -#endif // Added 2024-05 ipfs::ClearDeprecatedIpfsPrefs(profile_prefs); diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 2b321665f1e..9aa41045514 100644 --- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -42,7 +42,6 @@ #include "brave/browser/tor/tor_profile_service_factory.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) #include "brave/browser/ai_chat/ai_chat_service_factory.h" #include "brave/browser/brave_browser_process.h" #include "brave/browser/misc_metrics/process_misc_metrics.h" @@ -56,7 +55,6 @@ #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "brave/components/ai_chat/core/common/pref_names.h" #include "components/grit/brave_components_strings.h" -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) #include "brave/browser/ui/ai_rewriter/ai_rewriter_dialog_delegate.h" @@ -189,7 +187,6 @@ void OnGetImageForTextCopy(base::WeakPtr web_contents, } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) constexpr char kAIChatRewriteDataKey[] = "ai_chat_rewrite_data"; struct AIChatRewriteData : public base::SupportsUserData::Data { @@ -338,7 +335,6 @@ void OnRewriteSuggestionCompleted( web_contents->RemoveUserData(kAIChatRewriteDataKey); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) bool CanOpenSplitViewForWebContents( base::WeakPtr web_contents) { @@ -370,16 +366,11 @@ void OpenLinkInSplitView(base::WeakPtr web_contents, BraveRenderViewContextMenu::BraveRenderViewContextMenu( content::RenderFrameHost& render_frame_host, const content::ContextMenuParams& params) - : RenderViewContextMenu_Chromium(render_frame_host, params) -#if BUILDFLAG(ENABLE_AI_CHAT) - , + : RenderViewContextMenu_Chromium(render_frame_host, params), ai_chat_submenu_model_(this), ai_chat_change_tone_submenu_model_(this), ai_chat_change_length_submenu_model_(this), - ai_chat_social_media_post_submenu_model_(this) -#endif -{ -} + ai_chat_social_media_post_submenu_model_(this) {} BraveRenderViewContextMenu::~BraveRenderViewContextMenu() = default; @@ -409,7 +400,6 @@ bool BraveRenderViewContextMenu::IsCommandIdEnabled(int id) const { #else return false; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) case IDC_AI_CHAT_CONTEXT_SUMMARIZE_TEXT: case IDC_AI_CHAT_CONTEXT_LEO_TOOLS: case IDC_AI_CHAT_CONTEXT_EXPLAIN: @@ -429,7 +419,6 @@ bool BraveRenderViewContextMenu::IsCommandIdEnabled(int id) const { case IDC_AI_CHAT_CONTEXT_CHANGE_LENGTH: case IDC_AI_CHAT_CONTEXT_CREATE_SOCIAL_MEDIA_POST: return IsAIChatEnabled(); -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) case IDC_AI_CHAT_CONTEXT_REWRITE: return ai_rewriter::features::IsAIRewriterEnabled(); @@ -481,7 +470,6 @@ void BraveRenderViewContextMenu::ExecuteCommand(int id, int event_flags) { CopyTextFromImage(); break; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) case IDC_AI_CHAT_CONTEXT_SUMMARIZE_TEXT: case IDC_AI_CHAT_CONTEXT_EXPLAIN: case IDC_AI_CHAT_CONTEXT_PARAPHRASE: @@ -498,7 +486,6 @@ void BraveRenderViewContextMenu::ExecuteCommand(int id, int event_flags) { case IDC_AI_CHAT_CONTEXT_EXPAND: ExecuteAIChatCommand(id); break; -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) case IDC_AI_CHAT_CONTEXT_REWRITE: ai_rewriter::AIRewriterDialogDelegate::Show( @@ -528,7 +515,6 @@ void BraveRenderViewContextMenu::CopyTextFromImage() { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) bool BraveRenderViewContextMenu::IsAIChatEnabled() const { return !params_.selection_text.empty() && ai_chat::IsAIChatEnabled(GetProfile()->GetPrefs()) && @@ -687,7 +673,6 @@ void BraveRenderViewContextMenu::BuildAIChatMenu() { *print_index, IDC_AI_CHAT_CONTEXT_LEO_TOOLS, IDS_AI_CHAT_CONTEXT_LEO_TOOLS, &ai_chat_submenu_model_); } -#endif void BraveRenderViewContextMenu::AddSpellCheckServiceItem(bool is_checked) { // Call our implementation, not the one in the base class. @@ -807,9 +792,7 @@ void BraveRenderViewContextMenu::InitMenu() { } } -#if BUILDFLAG(ENABLE_AI_CHAT) BuildAIChatMenu(); -#endif // Add Open Link in Split View if (CanOpenSplitViewForWebContents(source_web_contents_->GetWeakPtr()) && diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h index 7b356d02144..87bfbb5a3e5 100644 --- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -6,17 +6,14 @@ #ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_ #define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/engine/engine_consumer.h" #include "brave/components/text_recognition/common/buildflags/buildflags.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/engine/engine_consumer.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - -#define BRAVE_RENDER_VIEW_CONTEXT_MENU_H_ \ - private: \ - friend class BraveRenderViewContextMenu; \ - public: +#define BRAVE_RENDER_VIEW_CONTEXT_MENU_H_ \ + private: \ + friend class BraveRenderViewContextMenu; \ + \ + public: // define BRAVE_RENDER_VIEW_CONTEXT_MENU_H_ // Get the Chromium declaration. @@ -68,23 +65,19 @@ class BraveRenderViewContextMenu : public RenderViewContextMenu_Chromium { void InitMenu() override; void NotifyMenuShown() override; -#if BUILDFLAG(ENABLE_AI_CHAT) bool IsAIChatEnabled() const; void ExecuteAIChatCommand(int command); void BuildAIChatMenu(); -#endif // BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(ENABLE_TEXT_RECOGNITION) void CopyTextFromImage(); #endif -#if BUILDFLAG(ENABLE_AI_CHAT) std::unique_ptr ai_engine_; ui::SimpleMenuModel ai_chat_submenu_model_; ui::SimpleMenuModel ai_chat_change_tone_submenu_model_; ui::SimpleMenuModel ai_chat_change_length_submenu_model_; ui::SimpleMenuModel ai_chat_social_media_post_submenu_model_; -#endif // BUILDFLAG(ENABLE_AI_CHAT) }; // Use our own subclass as the real RenderViewContextMenu. diff --git a/chromium_src/chrome/browser/ui/BUILD.gn b/chromium_src/chrome/browser/ui/BUILD.gn index 95f3b0cb368..e139d286a0e 100644 --- a/chromium_src/chrome/browser/ui/BUILD.gn +++ b/chromium_src/chrome/browser/ui/BUILD.gn @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni") import("//build/config/ui.gni") @@ -16,17 +15,11 @@ group("ui") { if (toolkit_views) { deps += [ - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/content/browser", + "//brave/components/ai_chat/core/browser", + "//brave/components/ai_chat/core/common", "//brave/components/sidebar/browser", ] - - if (enable_ai_chat) { - deps += [ - "//brave/components/ai_chat/content/browser", - "//brave/components/ai_chat/core/browser", - "//brave/components/ai_chat/core/common", - ] - } } if (enable_brave_webtorrent) { diff --git a/chromium_src/chrome/browser/ui/webui/chrome_untrusted_web_ui_configs.cc b/chromium_src/chrome/browser/ui/webui/chrome_untrusted_web_ui_configs.cc index 62af2f55591..6c2a2a6824b 100644 --- a/chromium_src/chrome/browser/ui/webui/chrome_untrusted_web_ui_configs.cc +++ b/chromium_src/chrome/browser/ui/webui/chrome_untrusted_web_ui_configs.cc @@ -6,22 +6,18 @@ #include "chrome/browser/ui/webui/chrome_untrusted_web_ui_configs.h" #include "base/feature_list.h" +#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" #include "brave/browser/ui/webui/brave_wallet/ledger/ledger_ui.h" #include "brave/browser/ui/webui/brave_wallet/line_chart/line_chart_ui.h" #include "brave/browser/ui/webui/brave_wallet/market/market_ui.h" #include "brave/browser/ui/webui/brave_wallet/nft/nft_ui.h" #include "brave/browser/ui/webui/brave_wallet/trezor/trezor_ui.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "brave/components/playlist/common/buildflags/buildflags.h" #include "build/build_config.h" #include "content/public/browser/webui_config_map.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/browser/ui/webui/ai_chat/ai_chat_ui.h" -#include "brave/components/ai_chat/core/common/features.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if BUILDFLAG(ENABLE_BRAVE_VPN) #if !BUILDFLAG(IS_ANDROID) #include "brave/browser/ui/webui/brave_vpn/vpn_panel_ui.h" @@ -70,10 +66,8 @@ void RegisterChromeUntrustedWebUIConfigs() { #endif // BUILDFLAG(ENABLE_PLAYLIST_WEBUI) #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat::features::IsAIChatEnabled()) { content::WebUIConfigMap::GetInstance().AddUntrustedWebUIConfig( std::make_unique()); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) } diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index 7808dbaf89c..fe805ae7833 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h" #include "chrome/browser/profiles/profile.h" @@ -13,8 +12,9 @@ #include "chrome/browser/win/jumplist_updater.h" void BraveRemoveJumplist(Profile* profile) { - if (!JumpList::Enabled() || !profile) + if (!JumpList::Enabled() || !profile) { return; + } auto app_id = shell_integration::win::GetAppUserModelIdForBrowser(profile->GetPath()); JumpListUpdater::DeleteJumpList(app_id); @@ -27,19 +27,13 @@ void BraveRemoveJumplist(Profile* profile) { browsing_data_important_sites_util #endif -#if BUILDFLAG(ENABLE_AI_CHAT) #define HOSTED_APPS_DATA \ BRAVE_AI_CHAT: \ remove_mask |= chrome_browsing_data_remover::DATA_TYPE_BRAVE_LEO_HISTORY; \ break; \ case BrowsingDataType::HOSTED_APPS_DATA -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #include "src/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc" - -#if BUILDFLAG(ENABLE_AI_CHAT) #undef HOSTED_APPS_DATA -#endif // BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(IS_WIN) #undef browsing_data_important_sites_util diff --git a/chromium_src/chrome/renderer/chrome_content_renderer_client.cc b/chromium_src/chrome/renderer/chrome_content_renderer_client.cc index 09e020080ff..6870e23ed04 100644 --- a/chromium_src/chrome/renderer/chrome_content_renderer_client.cc +++ b/chromium_src/chrome/renderer/chrome_content_renderer_client.cc @@ -3,7 +3,8 @@ * 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/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" +#include "brave/components/ai_chat/renderer/page_content_extractor.h" #include "brave/components/ai_rewriter/common/buildflags/buildflags.h" #include "brave/components/content_settings/renderer/brave_content_settings_agent_impl.h" #include "chrome/common/chrome_isolated_world_ids.h" @@ -12,11 +13,6 @@ #include "components/feed/content/renderer/rss_link_reader.h" #include "content/public/common/isolated_world_ids.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#include "brave/components/ai_chat/renderer/page_content_extractor.h" -#endif - #if BUILDFLAG(ENABLE_AI_REWRITER) #include "brave/components/ai_rewriter/common/features.h" #include "brave/components/ai_rewriter/renderer/ai_rewriter_agent.h" @@ -28,13 +24,11 @@ void RenderFrameWithBinderRegistryCreated( content::RenderFrame* render_frame, service_manager::BinderRegistry* registry) { new feed::RssLinkReader(render_frame, registry); -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat::features::IsAIChatEnabled() && !IsIncognitoProcess()) { new ai_chat::PageContentExtractor(render_frame, registry, content::ISOLATED_WORLD_ID_GLOBAL, ISOLATED_WORLD_ID_BRAVE_INTERNAL); } -#endif #if BUILDFLAG(ENABLE_AI_REWRITER) if (ai_rewriter::features::IsAIRewriterEnabled()) { diff --git a/chromium_src/chrome/renderer/url_loader_throttle_provider_impl.cc b/chromium_src/chrome/renderer/url_loader_throttle_provider_impl.cc index 69b81cf0212..392b709a525 100644 --- a/chromium_src/chrome/renderer/url_loader_throttle_provider_impl.cc +++ b/chromium_src/chrome/renderer/url_loader_throttle_provider_impl.cc @@ -5,19 +5,15 @@ #include "chrome/renderer/url_loader_throttle_provider_impl.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" -#include "brave/components/tor/buildflags/buildflags.h" -#include "brave/renderer/brave_content_renderer_client.h" -#include "services/network/public/cpp/resource_request.h" -#include "third_party/blink/public/common/loader/resource_type_util.h" - -#if BUILDFLAG(ENABLE_AI_CHAT) #include "brave/components/ai_chat/core/common/features.h" #include "brave/components/ai_chat/renderer/ai_chat_resource_sniffer.h" #include "brave/components/ai_chat/renderer/page_content_extractor.h" #include "brave/components/body_sniffer/body_sniffer_throttle.h" +#include "brave/components/tor/buildflags/buildflags.h" +#include "brave/renderer/brave_content_renderer_client.h" +#include "services/network/public/cpp/resource_request.h" +#include "third_party/blink/public/common/loader/resource_type_util.h" #include "third_party/blink/public/web/web_local_frame.h" -#endif #if BUILDFLAG(ENABLE_TOR) #include "brave/components/tor/renderer/onion_domain_throttle.h" @@ -39,7 +35,6 @@ std::unique_ptr MaybeCreateAIChatResourceSnifferThrottle( base::optional_ref local_frame_token, const network::ResourceRequest& request) { -#if BUILDFLAG(ENABLE_AI_CHAT) if (!ai_chat::features::IsAIChatEnabled() || !local_frame_token.has_value() || !content::RenderThread::IsMainThread()) { return nullptr; @@ -61,9 +56,6 @@ MaybeCreateAIChatResourceSnifferThrottle( base::SequencedTaskRunner::GetCurrentDefault()); body_sniffer_throttle->AddHandler(std::move(ai_chat_resource_sniffer)); return body_sniffer_throttle; -#else - return nullptr; -#endif } } // namespace diff --git a/chromium_src/components/browsing_data/core/DEPS b/chromium_src/components/browsing_data/core/DEPS deleted file mode 100644 index eedf90b7aa2..00000000000 --- a/chromium_src/components/browsing_data/core/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+brave/components/ai_chat/core/common/buildflags/buildflags.h", -] diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.cc b/chromium_src/components/browsing_data/core/browsing_data_utils.cc index bfa068f1f05..ef46bda0ae2 100644 --- a/chromium_src/components/browsing_data/core/browsing_data_utils.cc +++ b/chromium_src/components/browsing_data/core/browsing_data_utils.cc @@ -10,7 +10,6 @@ #include "base/containers/fixed_flat_map.h" -#if BUILDFLAG(ENABLE_AI_CHAT) #define GetDeletionPreferenceFromDataType \ GetDeletionPreferenceFromDataType_ChromiumImpl #define GetDataTypeFromDeletionPreference \ @@ -18,19 +17,15 @@ #define TABS \ TABS: \ case BrowsingDataType::BRAVE_AI_CHAT -#endif // BUILDFLAG(ENABLE_AI_CHAT) #include "src/components/browsing_data/core/browsing_data_utils.cc" -#if BUILDFLAG(ENABLE_AI_CHAT) #undef TABS -#endif // BUILDFLAG(ENABLE_AI_CHAT) #undef GetDataTypeFromDeletionPreference #undef GetDeletionPreferenceFromDataType namespace browsing_data { -#if BUILDFLAG(ENABLE_AI_CHAT) bool GetDeletionPreferenceFromDataType( BrowsingDataType data_type, ClearBrowsingDataTab clear_browsing_data_tab, @@ -60,6 +55,5 @@ std::optional GetDataTypeFromDeletionPreference( } return GetDataTypeFromDeletionPreference_ChromiumImpl(pref_name); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) } // namespace browsing_data diff --git a/chromium_src/components/browsing_data/core/browsing_data_utils.h b/chromium_src/components/browsing_data/core/browsing_data_utils.h index 53204f96cdc..96ea70dac84 100644 --- a/chromium_src/components/browsing_data/core/browsing_data_utils.h +++ b/chromium_src/components/browsing_data/core/browsing_data_utils.h @@ -6,16 +6,8 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" - -#if BUILDFLAG(ENABLE_AI_CHAT) #define HOSTED_APPS_DATA HOSTED_APPS_DATA, BRAVE_AI_CHAT -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #include "src/components/browsing_data/core/browsing_data_utils.h" // IWYU pragma: export - -#if BUILDFLAG(ENABLE_AI_CHAT) #undef HOSTED_APPS_DATA -#endif // BUILDFLAG(ENABLE_AI_CHAT) #endif // BRAVE_CHROMIUM_SRC_COMPONENTS_BROWSING_DATA_CORE_BROWSING_DATA_UTILS_H_ diff --git a/chromium_src/components/omnibox/browser/actions/omnibox_action.h b/chromium_src/components/omnibox/browser/actions/omnibox_action.h index 637198332e5..ac7e04bb763 100644 --- a/chromium_src/components/omnibox/browser/actions/omnibox_action.h +++ b/chromium_src/components/omnibox/browser/actions/omnibox_action.h @@ -6,7 +6,6 @@ #ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_OMNIBOX_BROWSER_ACTIONS_OMNIBOX_ACTION_H_ #define BRAVE_CHROMIUM_SRC_COMPONENTS_OMNIBOX_BROWSER_ACTIONS_OMNIBOX_ACTION_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/commander/common/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_COMMANDER) @@ -17,12 +16,10 @@ virtual commander::CommanderFrontendDelegate* GetCommanderDelegate #endif // BUILDFLAG(ENABLE_COMMANDER) -#if BUILDFLAG(ENABLE_AI_CHAT) #define NewIncognitoWindow \ NewIncognitoWindow() = 0; \ virtual void OpenLeo(const std::u16string& query) = 0; \ virtual bool IsLeoProviderEnabled -#endif // BUILDFLAG(ENABLE_AI_CHAT) #include "src/components/omnibox/browser/actions/omnibox_action.h" // IWYU pragma: export #undef NewIncognitoWindow diff --git a/chromium_src/components/omnibox/browser/autocomplete_controller.cc b/chromium_src/components/omnibox/browser/autocomplete_controller.cc index da8da2774b7..44492b4a440 100644 --- a/chromium_src/components/omnibox/browser/autocomplete_controller.cc +++ b/chromium_src/components/omnibox/browser/autocomplete_controller.cc @@ -3,13 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "components/omnibox/browser/autocomplete_controller.h" + #include #include #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/brave_search_conversion/utils.h" #include "brave/components/commander/common/buildflags/buildflags.h" #include "brave/components/omnibox/browser/brave_bookmark_provider.h" @@ -18,10 +20,10 @@ #include "brave/components/omnibox/browser/brave_local_history_zero_suggest_provider.h" #include "brave/components/omnibox/browser/brave_search_provider.h" #include "brave/components/omnibox/browser/brave_shortcuts_provider.h" +#include "brave/components/omnibox/browser/leo_provider.h" #include "brave/components/omnibox/browser/promotion_provider.h" #include "brave/components/omnibox/browser/promotion_utils.h" #include "brave/components/omnibox/browser/topsites_provider.h" -#include "components/omnibox/browser/autocomplete_controller.h" #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/calculator_provider.h" @@ -36,11 +38,6 @@ #include "brave/components/omnibox/browser/commander_provider.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/omnibox/browser/leo_provider.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - using brave_search_conversion::IsBraveSearchConversionFeatureEnabled; namespace { @@ -86,7 +83,6 @@ void MaybeAddCommanderProvider(AutocompleteController::Providers& providers, void MaybeAddLeoProvider(AutocompleteController::Providers& providers, AutocompleteController* controller) { -#if BUILDFLAG(ENABLE_AI_CHAT) auto* provider_client = controller->autocomplete_provider_client(); // TestOmniboxClient has null prefs getter auto* prefs = provider_client->GetPrefs(); @@ -94,11 +90,9 @@ void MaybeAddLeoProvider(AutocompleteController::Providers& providers, !provider_client->IsOffTheRecord()) { providers.push_back(base::MakeRefCounted(provider_client)); } -#endif // BUILDFLAG(ENABLE_AI_CHAT) } void MaybeShowLeoMatch(AutocompleteResult* result) { -#if BUILDFLAG(ENABLE_AI_CHAT) DCHECK(result); if (result->size() == 0) { @@ -114,7 +108,6 @@ void MaybeShowLeoMatch(AutocompleteResult* result) { // Regardless of the relevance score, we want to show the Leo match at the // bottom. But could be followed by Brave Search promotion. result->ReorderMatch(leo_match, -1); -#endif // BUILDFLAG(ENABLE_AI_CHAT) } } // namespace diff --git a/chromium_src/components/omnibox/browser/mock_autocomplete_provider_client.h b/chromium_src/components/omnibox/browser/mock_autocomplete_provider_client.h index 8c7d334bcaf..07a06e0d163 100644 --- a/chromium_src/components/omnibox/browser/mock_autocomplete_provider_client.h +++ b/chromium_src/components/omnibox/browser/mock_autocomplete_provider_client.h @@ -8,7 +8,6 @@ #include "components/omnibox/browser/autocomplete_provider_client.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/commander/common/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_COMMANDER) @@ -32,7 +31,6 @@ scoped_refptr GetTopSites #endif -#if BUILDFLAG(ENABLE_AI_CHAT) #define GetRemoteSuggestionsService \ GetRemoteSuggestionsService_Unused() { \ return nullptr; \ @@ -42,7 +40,6 @@ return false; \ } \ RemoteSuggestionsService* GetRemoteSuggestionsService -#endif #include "src/components/omnibox/browser/mock_autocomplete_provider_client.h" // IWYU pragma: export diff --git a/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.h b/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.h index 5d42995bb22..294a4c35ec1 100644 --- a/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.h +++ b/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.h @@ -6,19 +6,14 @@ #ifndef BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_AUTOCOMPLETE_MODEL_AUTOCOMPLETE_PROVIDER_CLIENT_IMPL_H_ #define BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_AUTOCOMPLETE_MODEL_AUTOCOMPLETE_PROVIDER_CLIENT_IMPL_H_ -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "build/build_config.h" #include "components/omnibox/browser/autocomplete_provider_client.h" -#if BUILDFLAG(ENABLE_AI_CHAT) #define GetAutocompleteClassifier \ GetAutocompleteClassifier() override; \ void OpenLeo(const std::u16string& query) override; \ bool IsLeoProviderEnabled -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #include "src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.h" // IWYU pragma: export - #undef GetAutocompleteClassifier #endif // BRAVE_CHROMIUM_SRC_IOS_CHROME_BROWSER_AUTOCOMPLETE_MODEL_AUTOCOMPLETE_PROVIDER_CLIENT_IMPL_H_ diff --git a/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.mm b/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.mm index 575c3e2b126..79b052f1542 100644 --- a/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.mm +++ b/chromium_src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.mm @@ -5,13 +5,10 @@ #include "src/ios/chrome/browser/autocomplete/model/autocomplete_provider_client_impl.mm" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "build/build_config.h" -#if BUILDFLAG(ENABLE_AI_CHAT) void AutocompleteProviderClientImpl::OpenLeo(const std::u16string& query) {} bool AutocompleteProviderClientImpl::IsLeoProviderEnabled() { return false; } -#endif // BUILDFLAG(ENABLE_AI_CHAT) diff --git a/common/extensions/api/BUILD.gn b/common/extensions/api/BUILD.gn index 70b248316d0..5adaf0e4c77 100644 --- a/common/extensions/api/BUILD.gn +++ b/common/extensions/api/BUILD.gn @@ -5,7 +5,6 @@ import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni") import("//brave/common/extensions/api/api_sources.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/resources/brave_grit.gni") import("//tools/json_schema_compiler/json_features.gni") import("//tools/json_schema_compiler/json_schema_api.gni") diff --git a/components/ai_chat/content/browser/BUILD.gn b/components/ai_chat/content/browser/BUILD.gn index 5f771501d52..126c207cee5 100644 --- a/components/ai_chat/content/browser/BUILD.gn +++ b/components/ai_chat/content/browser/BUILD.gn @@ -3,11 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/text_recognition/common/buildflags/buildflags.gni") -assert(enable_ai_chat) - static_library("browser") { sources = [ "ai_chat_brave_search_throttle.cc", @@ -28,7 +25,6 @@ static_library("browser") { "//base", "//brave/components/ai_chat/core/browser", "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/buildflags", "//brave/components/ai_chat/core/common/mojom", "//brave/components/api_request_helper", "//brave/components/brave_stats/browser", diff --git a/components/ai_chat/content/browser/ai_chat_throttle.cc b/components/ai_chat/content/browser/ai_chat_throttle.cc index 4b38ae22665..2667b926406 100644 --- a/components/ai_chat/content/browser/ai_chat_throttle.cc +++ b/components/ai_chat/content/browser/ai_chat_throttle.cc @@ -8,7 +8,6 @@ #include #include "brave/components/ai_chat/core/browser/utils.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/ai_chat/core/common/features.h" #include "brave/components/constants/webui_url_constants.h" #include "components/user_prefs/user_prefs.h" diff --git a/components/ai_chat/core/browser/BUILD.gn b/components/ai_chat/core/browser/BUILD.gn index a84e77ab9f8..a57ac802f6a 100644 --- a/components/ai_chat/core/browser/BUILD.gn +++ b/components/ai_chat/core/browser/BUILD.gn @@ -3,12 +3,9 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/text_recognition/common/buildflags/buildflags.gni") import("//tools/json_schema_compiler/json_schema_api.gni") -assert(enable_ai_chat) - static_library("browser") { sources = [ "ai_chat_credential_manager.cc", diff --git a/components/ai_chat/core/browser/engine/oai_api_client.cc b/components/ai_chat/core/browser/engine/oai_api_client.cc index afd4c679608..6faabe568fb 100644 --- a/components/ai_chat/core/browser/engine/oai_api_client.cc +++ b/components/ai_chat/core/browser/engine/oai_api_client.cc @@ -11,7 +11,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/types/expected.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/ai_chat/core/common/features.h" #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "brave/components/constants/brave_services_key.h" diff --git a/components/ai_chat/core/common/BUILD.gn b/components/ai_chat/core/common/BUILD.gn index e923371bb8c..25604afdac5 100644 --- a/components/ai_chat/core/common/BUILD.gn +++ b/components/ai_chat/core/common/BUILD.gn @@ -3,10 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - -assert(enable_ai_chat) - component("common") { output_name = "ai_chat_common" defines = [ "IS_AI_CHAT_COMMON_IMPL" ] @@ -24,7 +20,6 @@ component("common") { deps = [ "//base", "//brave/brave_domains", - "//brave/components/ai_chat/core/common/buildflags:buildflags", "//components/prefs", "//url", ] diff --git a/components/ai_chat/core/common/buildflags/BUILD.gn b/components/ai_chat/core/common/buildflags/BUILD.gn index 2b001014135..8478121a9c5 100644 --- a/components/ai_chat/core/common/buildflags/BUILD.gn +++ b/components/ai_chat/core/common/buildflags/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/build/config.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//build/buildflag_header.gni") declare_args() { @@ -17,9 +16,5 @@ if (is_official_build) { buildflag_header("buildflags") { header = "buildflags.h" - flags = [ - "ENABLE_AI_CHAT=$enable_ai_chat", - "SERVICE_KEY_AICHAT=\"$service_key_aichat\"", - "ENABLE_AI_CHAT_FEATURE_FLAG=true", - ] + flags = [ "SERVICE_KEY_AICHAT=\"$service_key_aichat\"" ] } diff --git a/components/ai_chat/core/common/buildflags/buildflags.gni b/components/ai_chat/core/common/buildflags/buildflags.gni deleted file mode 100644 index d4881f3ff6d..00000000000 --- a/components/ai_chat/core/common/buildflags/buildflags.gni +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2023 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/. - -declare_args() { - enable_ai_chat = true -} diff --git a/components/ai_chat/core/common/features.cc b/components/ai_chat/core/common/features.cc index e4f34ce7368..60b211f5d11 100644 --- a/components/ai_chat/core/common/features.cc +++ b/components/ai_chat/core/common/features.cc @@ -9,17 +9,12 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" namespace ai_chat::features { BASE_FEATURE(kAIChat, "AIChat", -#if BUILDFLAG(ENABLE_AI_CHAT_FEATURE_FLAG) base::FEATURE_ENABLED_BY_DEFAULT -#else - base::FEATURE_DISABLED_BY_DEFAULT -#endif ); const base::FeatureParam kAIModelsDefaultKey{ &kAIChat, "default_model", "chat-leo-expanded"}; diff --git a/components/ai_chat/renderer/BUILD.gn b/components/ai_chat/renderer/BUILD.gn index 7394baf8dd0..153021f4b1a 100644 --- a/components/ai_chat/renderer/BUILD.gn +++ b/components/ai_chat/renderer/BUILD.gn @@ -3,10 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - -assert(enable_ai_chat) - static_library("renderer") { sources = [ "ai_chat_resource_sniffer.cc", diff --git a/components/ai_chat/resources/page/BUILD.gn b/components/ai_chat/resources/page/BUILD.gn index 97020455742..baa579393e0 100644 --- a/components/ai_chat/resources/page/BUILD.gn +++ b/components/ai_chat/resources/page/BUILD.gn @@ -3,11 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/common/typescript.gni") -assert(enable_ai_chat) - transpile_web_ui("ai_chat_ui") { resource_name = "ai_chat_ui" entry_points = [ [ diff --git a/components/ai_rewriter/common/buildflags/buildflags.gni b/components/ai_rewriter/common/buildflags/buildflags.gni index bfaab4f9344..372e96e3379 100644 --- a/components/ai_rewriter/common/buildflags/buildflags.gni +++ b/components/ai_rewriter/common/buildflags/buildflags.gni @@ -3,9 +3,7 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") - declare_args() { # At the moment, the rewriter is enabled on Desktop if ai_chat is - enable_ai_rewriter = enable_ai_chat && (is_linux || is_win || is_mac) + enable_ai_rewriter = is_linux || is_win || is_mac } diff --git a/components/ai_rewriter/resources/page/BUILD.gn b/components/ai_rewriter/resources/page/BUILD.gn index 8208cf291ae..a630482b6b1 100644 --- a/components/ai_rewriter/resources/page/BUILD.gn +++ b/components/ai_rewriter/resources/page/BUILD.gn @@ -3,11 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/common/typescript.gni") -assert(enable_ai_chat) - transpile_web_ui("ai_rewriter_ui") { resource_name = "ai_rewriter_ui" entry_points = [ [ diff --git a/components/brave_mobile_subscription/renderer/android/BUILD.gn b/components/brave_mobile_subscription/renderer/android/BUILD.gn index 3016cba3bf3..b815ece42df 100644 --- a/components/brave_mobile_subscription/renderer/android/BUILD.gn +++ b/components/brave_mobile_subscription/renderer/android/BUILD.gn @@ -3,10 +3,8 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") -assert(enable_brave_vpn || enable_ai_chat) assert(is_android) source_set("android") { @@ -17,7 +15,8 @@ source_set("android") { deps = [ "//base", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", + "//brave/components/ai_chat/core/common/mojom", "//brave/components/brave_vpn/common/buildflags", "//brave/components/skus/renderer", "//content/public/renderer", @@ -29,12 +28,6 @@ source_set("android") { "//v8", ] - if (enable_ai_chat) { - deps += [ - "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/mojom", - ] - } if (enable_brave_vpn) { deps += [ "//brave/components/brave_vpn/common", @@ -52,10 +45,9 @@ source_set("browser_tests") { deps = [ "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/brave_mobile_subscription/renderer/android", "//brave/components/brave_vpn/common", "//brave/components/brave_vpn/common/buildflags:buildflags", - "//brave/components/brave_mobile_subscription/renderer/android", "//brave/components/skus/common", "//chrome/common", "//content/public/common", diff --git a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.cc b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.cc index 4a4c8e1b702..edad9b39e39 100644 --- a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.cc +++ b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.cc @@ -13,6 +13,7 @@ #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/skus/renderer/skus_utils.h" #include "build/build_config.h" #include "content/public/renderer/render_frame.h" @@ -25,10 +26,6 @@ #include "brave/components/brave_vpn/common/brave_vpn_utils.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif - namespace brave_subscription { namespace { @@ -61,7 +58,7 @@ bool SubscriptionRenderFrameObserver::EnsureConnected() { bound |= vpn_service_.is_bound(); } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) + if (ai_chat::features::IsAIChatEnabled() && product_ == Product::kLeo) { if (!ai_chat_subscription_.is_bound()) { render_frame()->GetBrowserInterfaceBroker().GetInterface( @@ -69,7 +66,6 @@ bool SubscriptionRenderFrameObserver::EnsureConnected() { } bound |= ai_chat_subscription_.is_bound(); } -#endif return bound; } @@ -103,13 +99,11 @@ void SubscriptionRenderFrameObserver::DidCreateScriptContext( } #endif } else if (product_ == Product::kLeo) { -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat_subscription_.is_bound()) { ai_chat_subscription_->GetPurchaseTokenOrderId(base::BindOnce( &SubscriptionRenderFrameObserver::OnGetPurchaseTokenOrderId, weak_factory_.GetWeakPtr())); } -#endif } } diff --git a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.h b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.h index 279bb094a29..22f7d3da7cb 100644 --- a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.h +++ b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame_observer.h" @@ -22,9 +22,6 @@ #if BUILDFLAG(ENABLE_BRAVE_VPN) #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom.h" -#endif namespace brave_subscription { @@ -76,9 +73,7 @@ class SubscriptionRenderFrameObserver : public content::RenderFrameObserver { #if BUILDFLAG(ENABLE_BRAVE_VPN) mojo::Remote vpn_service_; #endif -#if BUILDFLAG(ENABLE_AI_CHAT) mojo::Remote ai_chat_subscription_; -#endif base::WeakPtrFactory weak_factory_{this}; }; diff --git a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer_browsertest.cc b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer_browsertest.cc index a18f7b342f1..481753cdf8e 100644 --- a/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer_browsertest.cc +++ b/components/brave_mobile_subscription/renderer/android/subscription_render_frame_observer_browsertest.cc @@ -7,9 +7,8 @@ #include "base/test/scoped_feature_list.h" #include "brave/components/ai_chat/core/common/features.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" -#include "brave/components/brave_vpn/common/features.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" +#include "brave/components/brave_vpn/common/features.h" #include "brave/components/skus/common/features.h" #include "content/public/common/isolated_world_ids.h" #include "content/public/test/content_mock_cert_verifier.h" @@ -18,8 +17,8 @@ namespace brave_subscription { -class SubscriptionRenderFrameObserverBrowserTest : - public content::RenderViewTest { +class SubscriptionRenderFrameObserverBrowserTest + : public content::RenderViewTest { public: SubscriptionRenderFrameObserverBrowserTest() { scoped_feature_list_.InitWithFeatures( @@ -35,7 +34,7 @@ class SubscriptionRenderFrameObserverBrowserTest : TEST_F(SubscriptionRenderFrameObserverBrowserTest, IsAllowed) { SubscriptionRenderFrameObserver observer(GetMainRenderFrame(), - content::ISOLATED_WORLD_ID_GLOBAL); + content::ISOLATED_WORLD_ID_GLOBAL); // VPN LoadHTMLWithUrlOverride( R"()", diff --git a/components/browsing_data/core/sources.gni b/components/browsing_data/core/sources.gni deleted file mode 100644 index 01bd3c6cffa..00000000000 --- a/components/browsing_data/core/sources.gni +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2023 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/. - -brave_components_browsing_data_core_deps = - [ "//brave/components/ai_chat/core/common/buildflags" ] diff --git a/components/omnibox/browser/sources.gni b/components/omnibox/browser/sources.gni index fe7839cdc7a..81f4ef1f906 100644 --- a/components/omnibox/browser/sources.gni +++ b/components/omnibox/browser/sources.gni @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/commander/common/buildflags/buildflags.gni") import("//brave/components/omnibox/buildflags/buildflags.gni") @@ -24,6 +23,10 @@ brave_components_omnibox_browser_sources = [ "//brave/components/omnibox/browser/brave_search_suggestion_parser.h", "//brave/components/omnibox/browser/brave_shortcuts_provider.cc", "//brave/components/omnibox/browser/brave_shortcuts_provider.h", + "//brave/components/omnibox/browser/leo_action.cc", + "//brave/components/omnibox/browser/leo_action.h", + "//brave/components/omnibox/browser/leo_provider.cc", + "//brave/components/omnibox/browser/leo_provider.h", "//brave/components/omnibox/browser/open_here_action.cc", "//brave/components/omnibox/browser/open_here_action.h", "//brave/components/omnibox/browser/promotion_provider.cc", @@ -36,6 +39,8 @@ brave_components_omnibox_browser_sources = [ brave_components_omnibox_browser_deps = [ "//base", + "//brave/components/ai_chat/core/browser", + "//brave/components/ai_chat/core/common", "//brave/components/brave_search_conversion", "//brave/components/commander/common/buildflags", "//brave/components/constants", @@ -56,21 +61,6 @@ if (is_ios) { brave_components_omnibox_browser_deps += [ "//content/public/common" ] } -if (enable_ai_chat) { - brave_components_omnibox_browser_sources += [ - "//brave/components/omnibox/browser/leo_action.cc", - "//brave/components/omnibox/browser/leo_action.h", - "//brave/components/omnibox/browser/leo_provider.cc", - "//brave/components/omnibox/browser/leo_provider.h", - ] - - brave_components_omnibox_browser_deps += [ - "//brave/components/ai_chat/core/browser", - "//brave/components/ai_chat/core/common", - "//brave/components/ai_chat/core/common/buildflags", - ] -} - if (enable_commander) { brave_components_omnibox_browser_sources += [ "//brave/components/omnibox/browser/commander_action.cc", diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn index 452e53e516c..951f9fe0c3d 100644 --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/ai_rewriter/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/playlist/common/buildflags/buildflags.gni") @@ -54,10 +53,12 @@ brave_grit("static_resources") { repack("resources") { deps = [ ":static_resources", + "//brave/components/ai_chat/resources/page:generated_resources", "//brave/components/ai_rewriter/common/buildflags", "//brave/components/skus/browser/resources:generated_resources", ] sources = [ + "$root_gen_dir/brave/components/ai_chat/resources/page/ai_chat_ui_generated.pak", "$root_gen_dir/brave/components/skus/browser/resources/skus_internals_generated.pak", "$root_gen_dir/components/brave_components_static.pak", ] @@ -101,11 +102,6 @@ repack("resources") { ] } - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/resources/page:generated_resources" ] - sources += [ "$root_gen_dir/brave/components/ai_chat/resources/page/ai_chat_ui_generated.pak" ] - } - if (enable_ai_rewriter) { deps += [ "//brave/components/ai_rewriter/resources/page:generated_resources" ] diff --git a/components/sidebar/browser/BUILD.gn b/components/sidebar/browser/BUILD.gn index 7e5087cd414..1c0cf30bc97 100644 --- a/components/sidebar/browser/BUILD.gn +++ b/components/sidebar/browser/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/playlist/common/buildflags/buildflags.gni") import("//build/config/ui.gni") @@ -23,7 +22,8 @@ static_library("browser") { deps = [ "//base", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/browser", + "//brave/components/ai_chat/core/common", "//brave/components/brave_wallet/common", "//brave/components/constants:constants", "//brave/components/l10n/common", @@ -36,13 +36,6 @@ static_library("browser") { "//url", ] - if (enable_ai_chat) { - deps += [ - "//brave/components/ai_chat/core/browser", - "//brave/components/ai_chat/core/common", - ] - } - if (enable_playlist) { deps += [ "//brave/components/playlist/common" ] } @@ -55,7 +48,7 @@ source_set("unit_tests") { deps = [ "//base", "//base/test:test_support", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", "//brave/components/sidebar/browser", "//components/prefs", "//components/prefs:test_support", @@ -67,10 +60,6 @@ source_set("unit_tests") { "//testing/gtest", ] - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common" ] - } - if (enable_playlist) { deps += [ "//brave/components/playlist/common" ] } diff --git a/components/sidebar/browser/sidebar_service.cc b/components/sidebar/browser/sidebar_service.cc index 4ad92262a78..c021b7c83c7 100644 --- a/components/sidebar/browser/sidebar_service.cc +++ b/components/sidebar/browser/sidebar_service.cc @@ -20,7 +20,7 @@ #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/browser/utils.h" #include "brave/components/brave_wallet/common/common_utils.h" #include "brave/components/constants/webui_url_constants.h" #include "brave/components/l10n/common/locale_util.h" @@ -37,10 +37,6 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/browser/utils.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if BUILDFLAG(ENABLE_PLAYLIST) #include "brave/components/playlist/common/features.h" #endif // BUILDFLAG(ENABLE_PLAYLIST) @@ -54,18 +50,23 @@ SidebarItem::BuiltInItemType GetBuiltInItemTypeForLegacyURL( // A previous version of prefs used the URL even for built-in items, and not // the |SidebarItem::BuiltInItemType|. Therefore, this list should not // need to be updated. - if (url == "https://together.brave.com/" || url == "https://talk.brave.com/") + if (url == "https://together.brave.com/" || + url == "https://talk.brave.com/") { return SidebarItem::BuiltInItemType::kBraveTalk; + } - if (url == "chrome://wallet/") + if (url == "chrome://wallet/") { return SidebarItem::BuiltInItemType::kWallet; + } if (url == "chrome://sidebar-bookmarks.top-chrome/" || - url == "chrome://bookmarks/") + url == "chrome://bookmarks/") { return SidebarItem::BuiltInItemType::kBookmarks; + } - if (url == "chrome://history/") + if (url == "chrome://history/") { return SidebarItem::BuiltInItemType::kHistory; + } NOTREACHED_IN_MIGRATION() << url; return SidebarItem::BuiltInItemType::kNone; @@ -299,12 +300,14 @@ void SidebarService::AddItem(const SidebarItem& item) { void SidebarService::RemoveItemAt(int index) { const SidebarItem removed_item = items_[index]; - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnWillRemoveItem(removed_item, index); + } items_.erase(items_.begin() + index); - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnItemRemoved(removed_item, index); + } UpdateSidebarItemsToPrefStore(); } @@ -313,15 +316,17 @@ void SidebarService::MoveItem(size_t from, size_t to) { DCHECK(items_.size() > static_cast(from) && items_.size() > static_cast(to)); - if (from == to) + if (from == to) { return; + } const SidebarItem item = items_[from]; items_.erase(items_.begin() + from); items_.insert(items_.begin() + to, item); - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnItemMoved(item, from, to); + } UpdateSidebarItemsToPrefStore(); } @@ -333,8 +338,9 @@ void SidebarService::UpdateItem(const GURL& old_url, DCHECK(old_url.is_valid() && new_url.is_valid()); DCHECK(!old_title.empty() && !new_title.empty()); - if (old_url == new_url && old_title == new_title) + if (old_url == new_url && old_title == new_title) { return; + } // Check any existing items doen't use |new_url| if |old_url| and |new_url| // is different. If both are same, only title will be updated. @@ -426,8 +432,9 @@ std::vector SidebarService::GetCurrentlyPresentBuiltInTypes() const { std::vector items; base::ranges::for_each(items_, [&items](const auto& item) { - if (IsBuiltInType(item)) + if (IsBuiltInType(item)) { items.push_back(item.built_in_item_type); + } }); return items; } @@ -648,7 +655,6 @@ SidebarItem SidebarService::GetBuiltInItemForType( return SidebarItem(); } case SidebarItem::BuiltInItemType::kChatUI: { -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat::IsAIChatEnabled(prefs_)) { return SidebarItem::Create( brave_l10n::GetLocalizedResourceUTF16String(IDS_CHAT_UI_TITLE), @@ -658,9 +664,6 @@ SidebarItem SidebarService::GetBuiltInItemForType( } else { return SidebarItem(); } -#else // BUILDFLAG(ENABLE_AI_CHAT) - return SidebarItem(); -#endif // BUILDFLAG(ENABLE_AI_CHAT) } case SidebarItem::BuiltInItemType::kNone: { NOTREACHED_IN_MIGRATION(); @@ -672,8 +675,9 @@ SidebarItem SidebarService::GetBuiltInItemForType( void SidebarService::OnPreferenceChanged(const std::string& pref_name) { if (pref_name == kSidebarShowOption) { - for (Observer& obs : observers_) + for (Observer& obs : observers_) { obs.OnShowSidebarOptionChanged(GetSidebarShowOption()); + } return; } } diff --git a/components/sidebar/browser/sidebar_service_unittest.cc b/components/sidebar/browser/sidebar_service_unittest.cc index 0c96cee1d0f..29bda159994 100644 --- a/components/sidebar/browser/sidebar_service_unittest.cc +++ b/components/sidebar/browser/sidebar_service_unittest.cc @@ -16,7 +16,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/values_test_util.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/playlist/common/buildflags/buildflags.h" #include "brave/components/sidebar/browser/constants.h" #include "brave/components/sidebar/browser/pref_names.h" @@ -30,10 +30,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif // BUILDFLAG(ENABLE_AI_CHAT) - #if BUILDFLAG(ENABLE_PLAYLIST) #include "brave/components/playlist/common/features.h" #endif // BUILDFLAG(ENABLE_PLAYLIST) @@ -239,11 +235,10 @@ class SidebarServiceTest : public testing::Test { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) if (!ai_chat::features::IsAIChatEnabled()) { item_count -= 1; } -#endif + return item_count; } @@ -513,12 +508,10 @@ TEST_F(SidebarServiceTest, NewDefaultItemAdded) { return false; } -#if BUILDFLAG(ENABLE_AI_CHAT) if (!ai_chat::features::IsAIChatEnabled() && built_in_type == SidebarItem::BuiltInItemType::kChatUI) { return false; } -#endif #if BUILDFLAG(ENABLE_PLAYLIST) if (!base::FeatureList::IsEnabled(playlist::features::kPlaylist) && @@ -825,11 +818,9 @@ TEST_F(SidebarServiceTest, BuiltInItemUpdateTestWithBuiltInItemTypeKey) { } #endif -#if BUILDFLAG(ENABLE_AI_CHAT) if (ai_chat::features::IsAIChatEnabled()) { expected_count += 1; } -#endif // Check service has updated built-in item. Previously url was deprecated.xxx. EXPECT_EQ(expected_count, service_->items().size()); @@ -935,8 +926,9 @@ class SidebarServiceTestWithPlaylist : public SidebarServiceTest { auto iter = base::ranges::find_if(items, [](const SidebarItem& item) { return item.type == SidebarItem::Type::kTypeBuiltIn && item.open_in_panel; }); - if (iter == items.end()) + if (iter == items.end()) { return; + } const int index = std::distance(items.begin(), iter); service_->RemoveItemAt(index); @@ -971,9 +963,7 @@ class SidebarServiceOrderingTest : public SidebarServiceTest { void SetUp() override { SidebarServiceTest::SetUp(); -#if BUILDFLAG(ENABLE_AI_CHAT) scoped_feature_list_.InitAndEnableFeature(ai_chat::features::kAIChat); -#endif // BUILDFLAG(ENABLE_AI_CHAT) } bool ValidateBuiltInTypesOrdering( @@ -1014,9 +1004,7 @@ class SidebarServiceOrderingTest : public SidebarServiceTest { } private: -#if BUILDFLAG(ENABLE_AI_CHAT) base::test::ScopedFeatureList scoped_feature_list_; -#endif // BUILDFLAG(ENABLE_AI_CHAT) }; TEST_F(SidebarServiceOrderingTest, BuiltInItemsDefaultOrder) { @@ -1049,11 +1037,7 @@ TEST_F(SidebarServiceOrderingTest, LoadFromPrefsAllBuiltInVisible) { SidebarItem::BuiltInItemType::kBraveTalk, }; -#if BUILDFLAG(ENABLE_AI_CHAT) auto expected_count = sidebar_items->size(); -#else - auto expected_count = sidebar_items->size() - 1; -#endif // BUILDFLAG(ENABLE_AI_CHAT) if (base::FeatureList::IsEnabled(playlist::features::kPlaylist)) { expected_count++; @@ -1077,11 +1061,7 @@ TEST_F(SidebarServiceOrderingTest, LoadFromPrefsWalletBuiltInHidden) { SidebarItem::BuiltInItemType::kPlaylist, }; -#if BUILDFLAG(ENABLE_AI_CHAT) auto expected_count = sidebar_items->size(); -#else - auto expected_count = sidebar_items->size() - 1; -#endif // BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(ENABLE_PLAYLIST) if (base::FeatureList::IsEnabled(playlist::features::kPlaylist)) { @@ -1108,11 +1088,7 @@ TEST_F(SidebarServiceOrderingTest, LoadFromPrefsAiChatBuiltInNotListed) { SidebarItem::BuiltInItemType::kWallet, }; -#if BUILDFLAG(ENABLE_AI_CHAT) auto expected_count = sidebar_items->size() + 1; -#else - auto expected_count = sidebar_items->size(); -#endif // BUILDFLAG(ENABLE_AI_CHAT) #if BUILDFLAG(ENABLE_PLAYLIST) if (base::FeatureList::IsEnabled(playlist::features::kPlaylist)) { diff --git a/components/webui/BUILD.gn b/components/webui/BUILD.gn index ff5d6940be5..7442d56f5c1 100644 --- a/components/webui/BUILD.gn +++ b/components/webui/BUILD.gn @@ -21,7 +21,6 @@ static_library("webui") { deps = [ "//base", - "//brave/components/ai_chat/core/common/buildflags", "//brave/components/ai_rewriter/common/buildflags", "//brave/components/brave_rewards/resources:static_resources", "//brave/components/constants", diff --git a/ios/browser/api/features/BUILD.gn b/ios/browser/api/features/BUILD.gn index 73e5f6b71e8..91d59a6f71c 100644 --- a/ios/browser/api/features/BUILD.gn +++ b/ios/browser/api/features/BUILD.gn @@ -12,7 +12,6 @@ source_set("features") { deps = [ "//base", "//brave/components/ai_chat/core/common:common", - "//brave/components/ai_chat/core/common/buildflags:buildflags", "//brave/components/brave_component_updater/browser:browser", "//brave/components/brave_news/common:common", "//brave/components/brave_rewards/common:features", diff --git a/ios/browser/api/features/features.mm b/ios/browser/api/features/features.mm index d7b036f5d9e..efc9741ccdf 100644 --- a/ios/browser/api/features/features.mm +++ b/ios/browser/api/features/features.mm @@ -7,7 +7,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/sys_string_conversions.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" #include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_component_updater/browser/features.h" #include "brave/components/brave_news/common/features.h" diff --git a/ios/browser/flags/about_flags.mm b/ios/browser/flags/about_flags.mm index 8b86d6db6e4..cf882364643 100644 --- a/ios/browser/flags/about_flags.mm +++ b/ios/browser/flags/about_flags.mm @@ -6,7 +6,7 @@ // This file is included into //ios/chrome/browser/flags/about_flags.mm #include "base/strings/string_util.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_ads/core/public/ads_feature.h" #include "brave/components/brave_component_updater/browser/features.h" #include "brave/components/brave_rewards/common/features.h" @@ -23,10 +23,6 @@ #include "ios/components/security_interstitials/https_only_mode/feature.h" #include "net/base/features.h" -#if BUILDFLAG(ENABLE_AI_CHAT) -#include "brave/components/ai_chat/core/common/features.h" -#endif - #define EXPAND_FEATURE_ENTRIES(...) __VA_ARGS__, #define BRAVE_SKU_SDK_FEATURE_ENTRIES \ @@ -112,7 +108,6 @@ security_interstitials::features::kHttpsOnlyMode), \ }) -#if BUILDFLAG(ENABLE_AI_CHAT) #define BRAVE_AI_CHAT_FEATURE_ENTRIES \ EXPAND_FEATURE_ENTRIES( \ { \ @@ -138,9 +133,6 @@ flags_ui::kOsIos, \ FEATURE_VALUE_TYPE(ai_chat::features::kPageContentRefine), \ }) -#else -#define BRAVE_AI_CHAT_FEATURE_ENTRIES -#endif #define BRAVE_PLAYLIST_FEATURE_ENTRIES \ EXPAND_FEATURE_ENTRIES({ \ diff --git a/ios/browser/flags/sources.gni b/ios/browser/flags/sources.gni index da13bb09507..4e7a22e05f9 100644 --- a/ios/browser/flags/sources.gni +++ b/ios/browser/flags/sources.gni @@ -5,7 +5,6 @@ brave_flags_deps = [ "//base", - "//brave/components/ai_chat/core/common/buildflags", "//brave/components/brave_ads/core", "//brave/components/brave_component_updater/browser", "//brave/components/brave_rewards/common", diff --git a/ios/browser/ui/webui/BUILD.gn b/ios/browser/ui/webui/BUILD.gn index 7846b2761e2..818ff0d1cc3 100644 --- a/ios/browser/ui/webui/BUILD.gn +++ b/ios/browser/ui/webui/BUILD.gn @@ -4,7 +4,6 @@ # You can obtain one at https://mozilla.org/MPL/2.0/. import("//brave/build/config.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") diff --git a/patches/components-browsing_data-core-BUILD.gn.patch b/patches/components-browsing_data-core-BUILD.gn.patch deleted file mode 100644 index 04f83cc2934..00000000000 --- a/patches/components-browsing_data-core-BUILD.gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn -index aed52b1002402a106b8dbc89d2247c29b6316640..b3dc395778cd07ee5994c64cec6337d746e3847b 100644 ---- a/components/browsing_data/core/BUILD.gn -+++ b/components/browsing_data/core/BUILD.gn -@@ -50,6 +50,7 @@ static_library("core") { - ] - - configs += [ "//build/config/compiler:wexit_time_destructors" ] -+ import("//brave/components/browsing_data/core/sources.gni") deps += brave_components_browsing_data_core_deps - } - - source_set("cookie_or_cache_deletion_choice") { diff --git a/renderer/BUILD.gn b/renderer/BUILD.gn index b6962fa552e..e3687c91e25 100644 --- a/renderer/BUILD.gn +++ b/renderer/BUILD.gn @@ -3,7 +3,6 @@ # 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/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/ai_rewriter/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/speedreader/common/buildflags/buildflags.gni") @@ -37,7 +36,7 @@ source_set("renderer") { deps += [ "//brave/components/speedreader/renderer" ] } - if (is_android && (enable_brave_vpn || enable_ai_chat)) { + if (is_android) { deps += [ "//brave/components/brave_mobile_subscription/renderer/android" ] } } diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc index 491505b927a..87e5f7689df 100644 --- a/renderer/brave_content_renderer_client.cc +++ b/renderer/brave_content_renderer_client.cc @@ -9,7 +9,7 @@ #include "base/feature_list.h" #include "base/ranges/algorithm.h" -#include "brave/components/ai_chat/core/common/buildflags/buildflags.h" +#include "brave/components/ai_chat/core/common/features.h" #include "brave/components/brave_search/common/brave_search_utils.h" #include "brave/components/brave_search/renderer/brave_search_render_frame_observer.h" #include "brave/components/brave_shields/core/common/features.h" @@ -58,10 +58,6 @@ #include "third_party/widevine/cdm/widevine_cdm_common.h" #endif -#if BUILDFLAG(ENABLE_AI_CHAT) && BUILDFLAG(IS_ANDROID) -#include "brave/components/ai_chat/core/common/features.h" -#endif - namespace { void MaybeRemoveWidevineSupport(media::GetSupportedKeySystemsCB cb, media::KeySystemInfos key_systems) { @@ -165,11 +161,8 @@ void BraveContentRendererClient::RenderFrameCreated( } #if BUILDFLAG(IS_ANDROID) - if (brave_vpn::IsBraveVPNFeatureEnabled() -#if BUILDFLAG(ENABLE_AI_CHAT) - || ai_chat::features::IsAIChatHistoryEnabled() -#endif - ) { + if (brave_vpn::IsBraveVPNFeatureEnabled() || + ai_chat::features::IsAIChatHistoryEnabled()) { new brave_subscription::SubscriptionRenderFrameObserver( render_frame, content::ISOLATED_WORLD_ID_GLOBAL); } diff --git a/renderer/sources.gni b/renderer/sources.gni index 0fb4561218a..4267b6adf74 100644 --- a/renderer/sources.gni +++ b/renderer/sources.gni @@ -3,7 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/ai_rewriter/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/playlist/common/buildflags/buildflags.gni") @@ -20,7 +19,8 @@ brave_chrome_renderer_sources = [ brave_chrome_renderer_deps = [ "//brave/common:mojo_bindings", - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", + "//brave/components/ai_chat/renderer", "//brave/components/ai_rewriter/common/buildflags", "//brave/components/brave_search/common", "//brave/components/brave_search/renderer", @@ -53,13 +53,6 @@ if (enable_speedreader) { ] } -if (enable_ai_chat) { - brave_chrome_renderer_deps += [ - "//brave/components/ai_chat/core/common:common", - "//brave/components/ai_chat/renderer", - ] -} - if (enable_playlist) { brave_chrome_renderer_deps += [ "//brave/components/playlist/renderer" ] } @@ -72,7 +65,7 @@ if (enable_brave_vpn) { brave_chrome_renderer_deps += [ "//brave/components/brave_vpn/common" ] } -if (is_android && (enable_brave_vpn || enable_ai_chat)) { +if (is_android) { brave_chrome_renderer_deps += [ "//brave/components/brave_mobile_subscription/renderer/android:android", ] diff --git a/test/BUILD.gn b/test/BUILD.gn index ed2c6071ae5..5bc7cf293d4 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -7,7 +7,6 @@ import("//brave/android/android_browser_tests.gni") import("//brave/browser/ethereum_remote_client/buildflags/buildflags.gni") import("//brave/browser/metrics/buildflags/buildflags.gni") import("//brave/build/config.gni") -import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni") import("//brave/components/brave_vpn/common/buildflags/buildflags.gni") import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni") import("//brave/components/brave_webtorrent/browser/buildflags/buildflags.gni") @@ -155,6 +154,7 @@ test("brave_unit_tests") { "//brave/brave_domains:unit_tests", "//brave/browser", "//brave/browser:unit_tests", + "//brave/browser/ai_chat:unit_tests", "//brave/browser/brave_ads", "//brave/browser/brave_ads/device_id:unit_tests", "//brave/browser/brave_wallet", @@ -175,12 +175,16 @@ test("brave_unit_tests") { "//brave/browser/search:unit_tests", "//brave/browser/themes", "//brave/browser/ui:unit_tests", + "//brave/browser/ui/ai_chat:unit_tests", "//brave/browser/ui/brave_rewards:unit_tests", "//brave/browser/ui/brave_tooltips", "//brave/browser/web_discovery:unit_tests", "//brave/chromium_src/components/flags_ui:unit_tests", "//brave/chromium_src/components/privacy_sandbox:unit_tests", "//brave/chromium_src/net/base:unit_tests", + "//brave/components/ai_chat/core/browser:unit_tests", + "//brave/components/ai_chat/core/common:unit_tests", + "//brave/components/ai_chat/renderer:unit_tests", "//brave/components/api_request_helper:api_request_helper_unit_tests", "//brave/components/brave_adaptive_captcha/test:brave_adaptive_captcha_unit_tests", "//brave/components/brave_ads/browser:test_support", @@ -365,16 +369,6 @@ test("brave_unit_tests") { ] } - if (enable_ai_chat) { - deps += [ - "//brave/browser/ai_chat:unit_tests", - "//brave/browser/ui/ai_chat:unit_tests", - "//brave/components/ai_chat/core/browser:unit_tests", - "//brave/components/ai_chat/core/common:unit_tests", - "//brave/components/ai_chat/renderer:unit_tests", - ] - } - data = [ "data/" ] if (enable_custom_background) { @@ -499,13 +493,12 @@ test("brave_unit_tests") { if (is_android) { deps += [ "//brave:brave_pak_assets", + "//brave/components/brave_mobile_subscription/renderer/android:unit_tests", "//chrome/android:chrome_apk_paks", "//chrome/test/android:chrome_java_test_support_common", "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java", ] - if (enable_brave_vpn || enable_ai_chat) { - deps += [ "//brave/components/brave_mobile_subscription/renderer/android:unit_tests" ] - } + if (use_v8_context_snapshot) { deps += [ "//tools/v8_context_snapshot" ] } @@ -1034,7 +1027,7 @@ test("brave_browser_tests") { "//brave/components/brave_vpn/common", ] } - if (is_android && (enable_brave_vpn || enable_ai_chat)) { + if (is_android) { deps += [ "//brave/components/brave_mobile_subscription/renderer/android:browser_tests" ] } @@ -1063,15 +1056,12 @@ test("brave_browser_tests") { if (enable_speedreader) { sources += [ "//brave/browser/speedreader/speedreader_browsertest.cc" ] deps += [ - "//brave/components/ai_chat/core/common/buildflags", + "//brave/components/ai_chat/core/common", "//brave/components/speedreader", "//brave/components/speedreader/common:mojom", "//chrome/browser/ui/browser_window", "//components/language/core/browser:browser", ] - if (enable_ai_chat) { - deps += [ "//brave/components/ai_chat/core/common" ] - } } if (enable_playlist) { @@ -1142,6 +1132,7 @@ test("brave_browser_tests") { deps += [ "//brave/app/theme:brave_theme_resources_grit", "//brave/app/theme:brave_unscaled_resources_grit", + "//brave/browser/ai_chat:browser_tests", "//brave/browser/brave_ads/creatives/search_result_ad:browser_tests", "//brave/browser/sharing_hub:browser_tests", "//brave/browser/ui/ai_rewriter:browsertest", @@ -1189,10 +1180,6 @@ test("brave_browser_tests") { ] } - if (enable_ai_chat) { - deps += [ "//brave/browser/ai_chat:browser_tests" ] - } - if (is_android) { use_default_launcher = false