PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
create-pull-request/patch-3dc5833
cromite/build/patches/Disable-integration-with-Gemini.patch
T

824 lines
39 KiB
Diff
Raw Permalink Blame History

From: uazo <uazo@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:10:20 +0000
Subject: Disable integration with Gemini
Due to errors, some points are not covered by the gn arg check.
This patch fixes build errors.
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
chrome/android/BUILD.gn | 2 -
.../android/java/res/xml/main_preferences.xml | 5 --
.../chrome/browser/ChromeTabbedActivity.java | 6 +--
.../chrome/browser/SnackbarActivity.java | 2 -
.../chrome/browser/ntp/NewTabPage.java | 2 -
.../browser/settings/SettingsActivity.java | 2 -
.../search/SearchIndexProviderRegistry.java | 1 -
.../TabbedAdaptiveToolbarBehavior.java | 8 ---
.../TabbedAppMenuPropertiesDelegate.java | 7 +--
.../tabbed_mode/TabbedRootUiCoordinator.java | 4 +-
chrome/browser/BUILD.gn | 8 ++-
chrome/browser/actor/BUILD.gn | 3 --
chrome/browser/android/tab_features.cc | 4 ++
chrome/browser/android/tab_features.h | 4 ++
.../browser/chrome_content_browser_client.cc | 4 +-
chrome/browser/extensions/api/BUILD.gn | 2 +-
.../api/experimental_actor/BUILD.gn | 2 +-
.../experimental_actor_api.cc | 11 +----
.../api/experimental_ai_data/BUILD.gn | 2 +-
.../experimental_ai_data_api.cc | 49 ++-----------------
.../api/pdf_viewer_private/BUILD.gn | 3 --
.../pdf_viewer_private_api.cc | 43 +---------------
chrome/browser/glic/BUILD.gn | 4 +-
chrome/browser/glic/android/BUILD.gn | 2 +-
chrome/browser/glic/public/glic_enabling.cc | 1 +
chrome/browser/pdf/BUILD.gn | 1 -
chrome/browser/profiles/BUILD.gn | 2 +-
...hrome_browser_main_extra_parts_profiles.cc | 2 +-
chrome/browser/sync/BUILD.gn | 4 +-
chrome/browser/sync/test/integration/BUILD.gn | 2 +-
chrome/browser/ui/BUILD.gn | 2 +-
chrome/browser/ui/pdf/BUILD.gn | 1 -
.../pdf/chrome_pdf_document_helper_client.cc | 2 +
.../ui/tabs/alert/tab_alert_controller.cc | 2 +
chrome/common/BUILD.gn | 1 +
chrome/common/chrome_features.cc | 1 +
chrome/common/features.gni | 2 +
chrome/test/BUILD.gn | 10 ++--
components/browser_sync/BUILD.gn | 2 +-
39 files changed, 51 insertions(+), 164 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -372,8 +372,6 @@ if (_is_default_toolchain) {
"//chrome/browser/creator/android:java",
"//chrome/browser/data_sharing:factory_java",
"//chrome/browser/data_sharing:instant_message_delegate_factory_java",
- "//chrome/browser/glic:public_java",
- "//chrome/browser/glic/android:java",
"//chrome/browser/page_content_annotations:factory_java",
"//chrome/browser/prefs/android:java",
"//chrome/browser/settings:search_java",
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -106,11 +106,6 @@ found in the LICENSE file.
android:order="19"
android:title="@string/tabs_settings_title"
app:isPreferenceVisible="false"/>
- <Preference
- android:fragment="org.chromium.chrome.browser.glic.GlicSettings"
- android:key="glic"
- android:order="20"
- android:title="@string/glic_button_entrypoint_label"/>
<Preference
android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
android:key="homepage"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1129,10 +1129,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
mXrSceneCoreSessionManagerSupplier.get(),
mBackPressManager,
getSnackbarManager(),
- /* glicClickHandler= */ () ->
- ((TabbedRootUiCoordinator) mRootUiCoordinator)
- .toggleGlic(),
- /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager(false));
+ /* glicClickHandler= */ () -> {},
+ /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager());
mLayoutStateProviderSupplier.set(mLayoutManager);
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
@@ -12,7 +12,6 @@ import androidx.annotation.CallSuper;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
-import org.chromium.chrome.browser.glic.GlicHelper;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.ParentOverrideSlot;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
@@ -45,7 +44,6 @@ public abstract class SnackbarActivity extends SynchronousInitializationActivity
getProfileSupplier()
.runSyncOrOnAvailable(
(profile) -> {
- GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, profile, this);
});
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.feed.FeedSurfaceProvider;
import org.chromium.chrome.browser.feed.FeedSwipeRefreshLayout;
import org.chromium.chrome.browser.feed.NtpFeedSurfaceLifecycleManager;
import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator;
-import org.chromium.chrome.browser.glic.GlicHelper;
import org.chromium.chrome.browser.layouts.LayoutType;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.LifecycleObserver;
@@ -967,7 +966,6 @@ public class NewTabPage
mLastShownTimeNs = System.nanoTime();
RecordUserAction.record("MobileNTPShown");
SuggestionsMetrics.recordSurfaceVisible();
- GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, mTab.getProfile(), mActivity);
}
/** Records UMA for the NTP being hidden and the time spent on it. */
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -58,7 +58,6 @@ import org.chromium.chrome.browser.back_press.BackPressHelper.OnKeyDownHandler;
import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.glic.GlicHelper;
import org.chromium.chrome.browser.init.ActivityLifecycleDispatcherImpl;
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
@@ -855,7 +854,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@Override
protected void onStart() {
super.onStart();
- GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, mProfile, this);
}
@Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
@@ -35,7 +35,6 @@ public final class SearchIndexProviderRegistry {
.SEARCH_INDEX_DATA_PROVIDER,
org.chromium.chrome.browser.contextualsearch.ContextualSearchSettingsFragment
.SEARCH_INDEX_DATA_PROVIDER,
- org.chromium.chrome.browser.glic.GlicSettings.SEARCH_INDEX_DATA_PROVIDER,
org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings
.SEARCH_INDEX_DATA_PROVIDER,
org.chromium.chrome.browser.homepage.settings.HomepageSettings
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.ai.PageSummaryButtonController;
import org.chromium.chrome.browser.bookmarks.AddToBookmarksToolbarButtonController;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
import org.chromium.chrome.browser.bookmarks.TabBookmarker;
-import org.chromium.chrome.browser.glic.GlicToolbarButtonController;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.tab_group_suggestion.toolbar.GroupSuggestionsButtonController;
import org.chromium.chrome.browser.tab_group_suggestion.toolbar.GroupSuggestionsButtonDataProvider;
@@ -125,13 +124,6 @@ public class TabbedAdaptiveToolbarBehavior implements AdaptiveToolbarBehavior {
controller.addButtonVariant(AdaptiveToolbarButtonVariant.TAB_GROUPING, tabGrouping);
}
- if (AdaptiveToolbarFeatures.isGlicActionEnabled()) {
- controller.addButtonVariant(
- AdaptiveToolbarButtonVariant.GLIC,
- new GlicToolbarButtonController(
- mContext, mActivityTabProvider, mToggleGlicCallback, trackerSupplier));
- }
-
mRegisterVoiceSearchRunnable.run();
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
@@ -1407,12 +1407,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|| !ChromeFeatureList.sGlic.isEnabled()) {
return null;
}
- return new MVCListAdapter.ListItem(
- AppMenuHandler.AppMenuItemType.STANDARD,
- buildModelForStandardMenuItem(
- R.id.glic_menu_id,
- R.string.glic_button_entrypoint_ask_gemini_label,
- shouldShowIconBeforeItem() ? R.drawable.ic_spark_24dp : Resources.ID_NULL));
+ return null;
}
/**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -111,7 +111,6 @@ import org.chromium.chrome.browser.gesturenav.GestureUserEducationIphController;
import org.chromium.chrome.browser.gesturenav.HistoryNavigationCoordinator;
import org.chromium.chrome.browser.gesturenav.NavigationSheet;
import org.chromium.chrome.browser.gesturenav.TabbedSheetDelegate;
-import org.chromium.chrome.browser.glic.GlicKeyedServiceHandler;
import org.chromium.chrome.browser.history.HistoryManagerUtils;
import org.chromium.chrome.browser.hub.HubManager;
import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthCoordinatorFactory;
@@ -2394,8 +2393,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
Profile profile = mTabModelSelectorSupplier.get().getCurrentModel().getProfile();
assert profile != null;
- return GlicKeyedServiceHandler.toggleGlic(
- profile, mChromeAndroidTaskSupplier.get(), preventClose);
+ return false;
}
/* package */ KeyboardFocusRowManager getKeyboardFocusRowManagerForTesting() {
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1101,7 +1101,7 @@ static_library("browser") {
"//chrome/browser/ntp_tiles:impl",
"//chrome/browser/memory:impl",
"//chrome/browser/preloading/search_preload:search_preload",
- "//chrome/browser/ai:impl",
+ # "//chrome/browser/ai:impl",
"//chrome/browser/autofill",
# speech:impl includes headers from the browser monolith (e.g.
@@ -1426,8 +1426,8 @@ static_library("browser") {
"//chrome/browser/accessibility_annotator/first_run",
"//chrome/browser/account_settings",
"//chrome/browser/affiliations",
- "//chrome/browser/ai",
- "//chrome/browser/ai:impl",
+ # "//chrome/browser/ai",
+ # "//chrome/browser/ai:impl",
"//chrome/browser/app_mode",
"//chrome/browser/autocomplete",
"//chrome/browser/autocomplete:aim_eligibility_service",
@@ -3083,8 +3083,6 @@ static_library("browser") {
"//chrome/browser/flags:flags_android_impl",
"//chrome/browser/gesturenav/android:gesturenav",
"//chrome/browser/gesturenav/android:impl",
- "//chrome/browser/glic/android",
- "//chrome/browser/glic/android:jni_headers",
"//chrome/browser/keyboard_accessory/android",
"//chrome/browser/language/android:jni_headers",
"//chrome/browser/lifetime/android:jni_headers",
diff --git a/chrome/browser/actor/BUILD.gn b/chrome/browser/actor/BUILD.gn
--- a/chrome/browser/actor/BUILD.gn
+++ b/chrome/browser/actor/BUILD.gn
@@ -402,9 +402,6 @@ source_set("browser_tests") {
":tools_test_support",
"ui:event_dispatcher",
"//chrome/browser/affiliations",
- "//chrome/browser/glic",
- "//chrome/browser/glic/actor:browser_tests",
- "//chrome/browser/glic/test_support",
"//chrome/browser/lookalikes:test_support",
"//chrome/browser/optimization_guide",
"//chrome/browser/optimization_guide:test_support",
diff --git a/chrome/browser/android/tab_features.cc b/chrome/browser/android/tab_features.cc
--- a/chrome/browser/android/tab_features.cc
+++ b/chrome/browser/android/tab_features.cc
@@ -12,9 +12,11 @@
#include "chrome/browser/actor/android/ui/actor_ui_tab_controller_android.h"
#include "chrome/browser/glic/public/features.h"
#include "chrome/browser/glic/public/glic_enabling.h"
+#if BUILDFLAG(ENABLE_GLIC)
#include "chrome/browser/glic/public/widget/glic_side_panel_coordinator_android.h"
#include "chrome/browser/glic/public/widget/glic_side_panel_coordinator_desktop_android.h"
#include "chrome/browser/glic/service/glic_instance_helper.h"
+#endif
#include "chrome/browser/net/qwac_web_contents_observer.h"
#include "chrome/browser/preloading/new_tab_page_preload/new_tab_page_preload_pipeline_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -73,6 +75,7 @@ TabFeatures::TabFeatures(content::WebContents* web_contents, Profile* profile) {
GetUserDataFactory().CreateInstance<lens::TabContextualizationController>(
*tab, tab);
+#if BUILDFLAG(ENABLE_GLIC)
glic_instance_helper_ =
GetUserDataFactory().CreateInstance<glic::GlicInstanceHelper>(*tab, tab);
if (AndroidSidePanelEnabledFn::IsEnabled()) {
@@ -85,6 +88,7 @@ TabFeatures::TabFeatures(content::WebContents* web_contents, Profile* profile) {
GetUserDataFactory()
.CreateInstance<glic::GlicSidePanelCoordinatorAndroid>(*tab, tab);
}
+#endif
}
TabFeatures::~TabFeatures() = default;
diff --git a/chrome/browser/android/tab_features.h b/chrome/browser/android/tab_features.h
--- a/chrome/browser/android/tab_features.h
+++ b/chrome/browser/android/tab_features.h
@@ -27,10 +27,12 @@ namespace content {
class WebContents;
} // namespace content
+#if BUILDFLAG(ENABLE_GLIC)
namespace glic {
class GlicInstanceHelper;
class GlicSidePanelCoordinator;
} // namespace glic
+#endif
namespace sync_sessions {
class SyncSessionsRouterTabHelper;
@@ -75,8 +77,10 @@ class TabFeatures {
std::unique_ptr<lens::TabContextualizationController>
tab_contextualization_controller_;
+#if BUILDFLAG(ENABLE_GLIC)
std::unique_ptr<glic::GlicInstanceHelper> glic_instance_helper_;
std::unique_ptr<glic::GlicSidePanelCoordinator> glic_side_panel_coordinator_;
+#endif
std::unique_ptr<actor::ui::ActorUiTabControllerInterface>
actor_ui_tab_controller_;
};
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -789,8 +789,6 @@ using web_apps::ChromeContentBrowserClientIsolatedWebAppsPart;
namespace {
-const char kAIManagerUserDataKey[] = "ai_manager";
-
#if BUILDFLAG(IS_MAC)
constexpr char kSecurePaymentConfirmationKeychainAccessGroup[] =
MAC_TEAM_IDENTIFIER_STRING "." MAC_BUNDLE_IDENTIFIER_STRING
@@ -8758,6 +8756,7 @@ void ChromeContentBrowserClient::BindAIManager(
base::SupportsUserData* context_user_data,
content::RenderFrameHost* rfh,
mojo::PendingReceiver<blink::mojom::AIManager> receiver) {
+#if false
if (!context_user_data->GetUserData(kAIManagerUserDataKey)) {
context_user_data->SetUserData(
kAIManagerUserDataKey,
@@ -8767,6 +8766,7 @@ void ChromeContentBrowserClient::BindAIManager(
AIManager* ai_manager = static_cast<AIManager*>(
context_user_data->GetUserData(kAIManagerUserDataKey));
ai_manager->AddReceiver(std::move(receiver));
+#endif
}
#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
diff --git a/chrome/browser/extensions/api/BUILD.gn b/chrome/browser/extensions/api/BUILD.gn
--- a/chrome/browser/extensions/api/BUILD.gn
+++ b/chrome/browser/extensions/api/BUILD.gn
@@ -132,7 +132,7 @@ function_registration("api_registration") {
"//components/policy/proto",
# Different APIs include headers from these targets.
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/common",
"//chrome/common:mojo_bindings",
"//components/autofill/core/common/mojom:mojo_types",
diff --git a/chrome/browser/extensions/api/experimental_actor/BUILD.gn b/chrome/browser/extensions/api/experimental_actor/BUILD.gn
--- a/chrome/browser/extensions/api/experimental_actor/BUILD.gn
+++ b/chrome/browser/extensions/api/experimental_actor/BUILD.gn
@@ -19,7 +19,7 @@ source_set("experimental_actor") {
deps = [
"//base",
"//chrome/browser/actor",
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/browser/extensions",
"//chrome/browser/ui",
]
diff --git a/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc b/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
--- a/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
+++ b/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
@@ -126,17 +126,10 @@ ExperimentalActorApiFunction::ExperimentalActorApiFunction() = default;
ExperimentalActorApiFunction::~ExperimentalActorApiFunction() = default;
bool ExperimentalActorApiFunction::PreRunValidation(std::string* error) {
- if (GetCurrentChannel() == version_info::Channel::STABLE &&
- !AiDataKeyedService::IsExtensionAllowlistedForStable(extension_id())) {
- *error = "API access not allowed on this channel.";
+ if ((false)) {
+ *error = "API not allowed.";
return false;
}
-
- if (!AiDataKeyedService::IsExtensionAllowlistedForActions(extension_id())) {
- *error = "Actions API access restricted for this extension.";
- return false;
- }
-
auto* actor_service = actor::ActorKeyedService::Get(browser_context());
if (!actor_service) {
*error = "Incognito profile not supported.";
diff --git a/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn b/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
--- a/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
+++ b/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
@@ -17,7 +17,7 @@ source_set("experimental_ai_data") {
deps = [
"//base",
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/browser/extensions",
"//chrome/browser/ui",
"//pdf/mojom",
diff --git a/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc b/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
--- a/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
+++ b/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
@@ -28,26 +28,10 @@ ExperimentalAiDataApiFunction::ExperimentalAiDataApiFunction() = default;
ExperimentalAiDataApiFunction::~ExperimentalAiDataApiFunction() = default;
bool ExperimentalAiDataApiFunction::PreRunValidation(std::string* error) {
- // Check the allowlist and return an error if extension is not allow listed.
- if (!AiDataKeyedService::IsExtensionAllowlistedForData(extension_id())) {
- *error = "API access restricted for this extension.";
+ if ((false)) {
+ *error = "API not allowed.";
return false;
}
-
- if (GetCurrentChannel() == version_info::Channel::STABLE &&
- !AiDataKeyedService::IsExtensionAllowlistedForStable(extension_id())) {
- *error = "API access not allowed on this channel.";
- return false;
- }
-
- auto* ai_data_service =
- AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
- if (!ai_data_service) {
- *error = "Incognito profile not supported.";
- return false;
- }
- DCHECK(ai_data_service);
-
return true;
}
@@ -82,15 +66,7 @@ ExtensionFunction::ResponseAction ExperimentalAiDataGetAiDataFunction::Run() {
}
DCHECK(web_contents);
- auto* ai_data_service =
- AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
- DCHECK(ai_data_service);
-
- ai_data_service->GetAiData(
- params->dom_node_id, web_contents, params->user_input,
- base::BindOnce(&ExperimentalAiDataGetAiDataFunction::OnDataCollected,
- this));
- return RespondLater();
+ return RespondNow(Error("Invalid api."));
}
ExperimentalAiDataGetAiDataWithSpecifierFunction::
@@ -111,24 +87,7 @@ ExperimentalAiDataGetAiDataWithSpecifierFunction::Run() {
}
DCHECK(web_contents);
- auto* ai_data_service =
- AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
- DCHECK(ai_data_service);
-
- // De-serailizing protos is safe per
- // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/security/rule-of-2.md
- optimization_guide::proto::ModelPrototypingCollectionSpecifier specifier;
- if (!specifier.ParseFromArray(params->ai_data_specifier.data(),
- params->ai_data_specifier.size())) {
- return RespondNow(Error("Parsing ai data specifier failed."));
- }
-
- ai_data_service->GetAiDataWithSpecifier(
- web_contents, specifier,
- base::BindOnce(
- &ExperimentalAiDataGetAiDataWithSpecifierFunction::OnDataCollected,
- this));
- return RespondLater();
+ return RespondNow(Error("Invalid api."));
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
--- a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
+++ b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
@@ -19,7 +19,6 @@ source_set("pdf_viewer_private") {
deps = [
"//base",
"//chrome/browser/extensions",
- "//chrome/browser/glic",
"//chrome/browser/pdf",
"//chrome/browser/pdf:pdf_pref_names",
"//chrome/browser/profiles:profile",
@@ -48,8 +47,6 @@ source_set("browser_tests") {
sources = [ "pdf_viewer_private_browsertest.cc" ]
deps = [
":pdf_viewer_private",
- "//chrome/browser/glic",
- "//chrome/browser/glic/test_support",
"//chrome/test:test_support",
"//content/test:test_support",
]
diff --git a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc b/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
--- a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
+++ b/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
@@ -12,9 +12,6 @@
#include "base/numerics/safe_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/glic/public/glic_enabling.h"
-#include "chrome/browser/glic/public/glic_keyed_service.h"
-#include "chrome/browser/glic/public/glic_keyed_service_factory.h"
#include "chrome/browser/pdf/pdf_pref_names.h"
#include "chrome/browser/pdf/pdf_viewer_stream_manager.h"
#include "chrome/browser/profiles/profile.h"
@@ -57,8 +54,6 @@ namespace SetPdfPluginAttributes =
namespace SetPdfDocumentTitle = api::pdf_viewer_private::SetPdfDocumentTitle;
-constexpr char kSummarizePrompt[] = "Summarize this document";
-
// Check if the current URL is allowed based on a list of allowlisted domains.
bool IsUrlAllowedToEmbedLocalFiles(const GURL& current_url,
const base::ListValue& allowlisted_domains) {
@@ -321,43 +316,7 @@ ExtensionFunction::ResponseAction PdfViewerPrivateGlicSummarizeFunction::Run() {
return RespondNow(Error("No tab."));
}
- if (!glic::GlicEnabling::IsEnabledForProfile(
- Profile::FromBrowserContext(contents->GetBrowserContext()))) {
- return RespondNow(Error("Glic is not enabled."));
- }
-
- glic::GlicKeyedService* glic_service =
- glic::GlicKeyedServiceFactory::GetGlicKeyedService(
- contents->GetBrowserContext());
- CHECK(glic_service);
-
- int arm = features::kPdfGlicSummarizeArm.Get();
- bool has_consented = glic::GlicEnabling::HasConsentedForProfile(
- Profile::FromBrowserContext(contents->GetBrowserContext()));
-
- glic::GlicInvokeOptions options{
- glic::mojom::InvocationSource::kPdfSummarizeButton};
- options.prompts.push_back(kSummarizePrompt);
- options.conversation = glic::NewConversation();
-
- if (has_consented) {
- glic_service->InvokeWithAutoSubmit(
- glic::InvokeWithAutoSubmitPasskeyProvider::GetPassKey(), tab_interface,
- std::move(options));
- } else {
- if (arm == 3) {
- options.fre_override = glic::mojom::FreOverride::kTrustFirstInline;
- glic_service->InvokeWithAutoSubmit(
- glic::InvokeWithAutoSubmitPasskeyProvider::GetPassKey(),
- tab_interface, std::move(options));
- } else {
- options.fre_override = glic::mojom::FreOverride::kTrustFirstText;
- glic_service->Invoke(tab_interface, std::move(options));
- }
- }
-
- success = true;
- return RespondNow(NoArguments());
+ return RespondNow(Error("Glic is not enabled."));
}
} // namespace extensions
diff --git a/chrome/browser/glic/BUILD.gn b/chrome/browser/glic/BUILD.gn
--- a/chrome/browser/glic/BUILD.gn
+++ b/chrome/browser/glic/BUILD.gn
@@ -458,9 +458,9 @@ source_set("impl") {
} else { # is_android
deps += [
":actor_types_for_migration",
- "//chrome/browser/glic/android",
+ #"//chrome/browser/glic/android",
"//chrome/browser/glic/android:jni_bridges",
- "//chrome/browser/ui/side_panel:side_panel_ui_provider",
+ #"//chrome/browser/ui/side_panel:side_panel_ui_provider",
"//chrome/browser/ui/side_panel/android",
"//ui/android",
]
diff --git a/chrome/browser/glic/android/BUILD.gn b/chrome/browser/glic/android/BUILD.gn
--- a/chrome/browser/glic/android/BUILD.gn
+++ b/chrome/browser/glic/android/BUILD.gn
@@ -87,7 +87,7 @@ source_set("jni_bridges") {
]
}
-source_set("android") {
+source_set("android_notused") {
sources = [
"glic_keyed_service_android.cc",
"glic_keyed_service_android.h",
diff --git a/chrome/browser/glic/public/glic_enabling.cc b/chrome/browser/glic/public/glic_enabling.cc
--- a/chrome/browser/glic/public/glic_enabling.cc
+++ b/chrome/browser/glic/public/glic_enabling.cc
@@ -444,6 +444,7 @@ GlicGlobalEnabling::GlicGlobalEnabling(Delegate& delegate) {
GlicGlobalEnabling::~GlicGlobalEnabling() = default;
bool GlicGlobalEnabling::IsEnabledByFlags() {
+ if ((true)) return false;
if (g_bypass_enablement_checks_for_testing) {
return true;
}
diff --git a/chrome/browser/pdf/BUILD.gn b/chrome/browser/pdf/BUILD.gn
--- a/chrome/browser/pdf/BUILD.gn
+++ b/chrome/browser/pdf/BUILD.gn
@@ -33,7 +33,6 @@ source_set("pdf") {
"//build:chromeos_buildflags",
"//chrome/browser:browser_process",
"//chrome/browser:resources",
- "//chrome/browser/glic",
"//chrome/browser/pdf:pdf_pref_names",
"//chrome/browser/profiles:profile",
"//chrome/browser/resources/pdf:resources",
diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -370,7 +370,7 @@ source_set("profiles_extra_parts_impl") {
"//chrome/browser/accessibility_annotator/first_run",
"//chrome/browser/account_settings",
"//chrome/browser/affiliations",
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/browser/autocomplete",
"//chrome/browser/autocomplete:aim_eligibility_service",
"//chrome/browser/autofill",
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -712,7 +712,7 @@ void ChromeBrowserMainExtraPartsProfiles::
actor_login::ActorLoginPermissionCleaningServiceFactory::GetInstance();
actor_login::ActorLoginPermissionServiceFactory::GetInstance();
chrome_finds_internals::ChromeFindsAgentFactory::GetInstance();
- AiDataKeyedServiceFactory::GetInstance();
+ // AiDataKeyedServiceFactory::GetInstance();
AimEligibilityServiceFactory::GetInstance();
#if BUILDFLAG(IS_ANDROID)
AndroidProfileBrowserCollectionServiceFactory::GetInstance();
diff --git a/chrome/browser/sync/BUILD.gn b/chrome/browser/sync/BUILD.gn
--- a/chrome/browser/sync/BUILD.gn
+++ b/chrome/browser/sync/BUILD.gn
@@ -105,7 +105,7 @@ source_set("sync") {
"//chrome/browser/password_manager/factories",
"//chrome/browser/plus_addresses",
"//chrome/browser/signin",
- "//chrome/browser/skills",
+ #"//chrome/browser/skills",
"//chrome/browser/subscription_eligibility",
"//chrome/browser/ui/sync",
"//chrome/browser/ui/toolbar",
@@ -151,7 +151,7 @@ source_set("sync") {
"//components/saved_tab_groups/public",
"//components/send_tab_to_self",
"//components/sharing_message",
- "//components/skills/public",
+ #"//components/skills/public",
"//components/spellcheck:buildflags",
"//components/spellcheck/browser",
"//components/strings:components_strings_grit",
diff --git a/chrome/browser/sync/test/integration/BUILD.gn b/chrome/browser/sync/test/integration/BUILD.gn
--- a/chrome/browser/sync/test/integration/BUILD.gn
+++ b/chrome/browser/sync/test/integration/BUILD.gn
@@ -266,7 +266,7 @@ source_set("sync_integration_tests_impl") {
"//chrome/browser/send_tab_to_self",
"//chrome/browser/send_tab_to_self:impl",
"//chrome/browser/sharing",
- "//chrome/browser/skills",
+ #"//chrome/browser/skills",
"//chrome/browser/themes",
"//chrome/browser/ui:ui_features",
"//chrome/browser/ui/send_tab_to_self",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -279,7 +279,7 @@ static_library("ui") {
"//chrome/browser:font_pref",
"//chrome/browser:global_features",
"//chrome/browser/affiliations",
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/browser/autocomplete",
"//chrome/browser/autocomplete:aim_eligibility_service",
"//chrome/browser/autofill",
diff --git a/chrome/browser/ui/pdf/BUILD.gn b/chrome/browser/ui/pdf/BUILD.gn
--- a/chrome/browser/ui/pdf/BUILD.gn
+++ b/chrome/browser/ui/pdf/BUILD.gn
@@ -15,7 +15,6 @@ source_set("pdf") {
]
deps = [
"//chrome/browser/download",
- "//chrome/browser/glic",
"//chrome/browser/pdf",
"//chrome/browser/screen_ai:screen_ai_install_state",
"//chrome/browser/ui/tab_contents",
diff --git a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
@@ -66,6 +66,7 @@ void LogGlicSummarizeMetrics(content::RenderFrameHost* render_frame_host) {
return;
}
+#if BUILDFLAG(ENABLE_GLIC)
bool glic_enabled = glic::GlicEnabling::IsEnabledForProfile(
Profile::FromBrowserContext(web_contents_to_use->GetBrowserContext()));
base::UmaHistogramBoolean("PDF.GlicEnabled", glic_enabled);
@@ -74,6 +75,7 @@ void LogGlicSummarizeMetrics(content::RenderFrameHost* render_frame_host) {
web_contents_to_use->GetBrowserContext());
base::UmaHistogramBoolean("PDF.GlicSummarizeButtonEnabled",
glic_summarize_button_enabled);
+#endif
}
} // namespace
diff --git a/chrome/browser/ui/tabs/alert/tab_alert_controller.cc b/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
--- a/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
+++ b/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
@@ -174,12 +174,14 @@ std::u16string TabAlertController::GetTabAlertStateText(
case TabAlert::kActorWaitingOnUser:
return l10n_util::GetStringUTF16(
IDS_TOOLTIP_TAB_ALERT_STATE_ACTOR_ACCESSING);
+#if BUILDFLAG(ENABLE_GLIC)
case TabAlert::kGlicAccessing:
return l10n_util::GetStringUTF16(
IDS_TOOLTIP_TAB_ALERT_STATE_GLIC_ACCESSING);
case TabAlert::kGlicSharing:
return l10n_util::GetStringUTF16(
IDS_TOOLTIP_TAB_ALERT_STATE_GLIC_SHARING);
+#endif
}
NOTREACHED();
}
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -55,6 +55,7 @@ buildflag_header("buildflags") {
"ENABLE_BACKGROUND_CONTENTS=$enable_background_contents",
"ENABLE_CHROME_NOTIFICATIONS=$enable_chrome_notifications",
"ENABLE_DOWNGRADE_PROCESSING=$enable_downgrade_processing",
+ "ENABLE_GLIC=$enable_glic",
"ENABLE_HANGOUT_SERVICES_EXTENSION=$enable_hangout_services_extension",
"ENABLE_PDF_SAVE_TO_DRIVE=$enable_pdf_save_to_drive",
"ENABLE_SERVICE_DISCOVERY=$enable_service_discovery",
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -453,6 +453,7 @@ BASE_FEATURE(kGlic,
base::FEATURE_DISABLED_BY_DEFAULT
#endif
);
+SET_CROMITE_FEATURE_DISABLED(kGlic);
// Controls whether the Glic feature is always detached.
BASE_FEATURE(kGlicDetached, base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -49,6 +49,8 @@ declare_args() {
# Enables usage of notifications via Chrome's MessageCenter.
enable_chrome_notifications = is_mac || is_win || is_linux
+ enable_glic = is_mac || is_win || is_linux || is_chromeos
+
# Skips unmigrated actor files in the build on Android. This is temporary, and
# will eventually be removed once migration is done. Adding this flag likely
# means the code needs to be adapted for Android. Once adapted, the final code
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2017,7 +2017,7 @@ if (is_android) {
"//chrome/browser/enterprise/data_controls",
"//chrome/browser/enterprise/platform_auth:features",
"//chrome/browser/flags:flags_android",
- "//chrome/browser/glic:browser_tests",
+ #"//chrome/browser/glic:browser_tests",
"//chrome/browser/history",
"//chrome/browser/keyboard_accessory/android:public",
"//chrome/browser/metrics:test_support",
@@ -2564,7 +2564,7 @@ if (!is_android) {
"//chrome/browser/actor:test_support",
"//chrome/browser/actor/ui:browser_tests",
"//chrome/browser/affiliations",
- "//chrome/browser/ai",
+ # "//chrome/browser/ai",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:app_registry_cache_waiter",
"//chrome/browser/apps/app_service:test_support",
@@ -7015,9 +7015,9 @@ test("unit_tests") {
"//chrome/browser/accessibility_annotator:unit_tests",
"//chrome/browser/actor:unit_tests",
"//chrome/browser/actor/ui:unit_tests",
- "//chrome/browser/ai",
- "//chrome/browser/ai:test_support",
- "//chrome/browser/ai:unit_tests",
+ # "//chrome/browser/ai",
+ # "//chrome/browser/ai:test_support",
+ # "//chrome/browser/ai:unit_tests",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps:user_type_filter",
"//chrome/browser/autocomplete",
diff --git a/components/browser_sync/BUILD.gn b/components/browser_sync/BUILD.gn
--- a/components/browser_sync/BUILD.gn
+++ b/components/browser_sync/BUILD.gn
@@ -51,7 +51,7 @@ static_library("browser_sync") {
"//components/send_tab_to_self",
"//components/sharing_message",
"//components/skills:features",
- "//components/skills/public",
+ #"//components/skills/public",
"//components/supervised_user/core/common:buildflags",
"//components/sync/invalidations",
"//components/sync_bookmarks",
--
Reference in New Issue View Git Blame Copy Permalink