diff --git a/DEPS b/DEPS index a4964f4d80a6e6..26416479ba34f5 100644 --- a/DEPS +++ b/DEPS @@ -306,7 +306,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '1ba82f650c64340d5f581522efa511ceea415c0b', + 'catapult_revision': 'e3f9ae73db5135ad998108113af7ef82a47efc51', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -314,7 +314,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': 'a84185e6b5be9c88f8aad0fa589ab7c213d77e5d', + 'devtools_frontend_revision': 'a1121f966ce5590b46706befdf60e3350a5cf2d1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -635,7 +635,7 @@ deps = { }, 'src/ios/third_party/material_components_ios/src': { - 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'fc61c312d9bd1650f8bb558359c3e179900bc94d', + 'url': Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + 'fae0808b93a28b00796cdf10d3f50e16aaf2d71e', 'condition': 'checkout_ios', }, @@ -1741,7 +1741,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'GNNkSm3f-_u5XLEkNk_gDIcdzAc9jLL9kkDHNH94I1kC', + 'version': 'FchxTKMvfxSkGTLMU23cSyqvexH52wHP-zPlLYF6QqUC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -2543,7 +2543,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', - 'version': 'version:2@1.5.0-alpha05.cr0', + 'version': 'version:2@1.6.0-alpha01.cr0', }, ], 'condition': 'checkout_android', diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index dd910ddef65fa7..d0ad3195a2eb9a 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -494,7 +494,7 @@ bool AwContentBrowserClient::CanCreateWindow( base::FilePath AwContentBrowserClient::GetDefaultDownloadDirectory() { // Android WebView does not currently use the Chromium downloads system. - // Download requests are cancelled immedately when recognized; see + // Download requests are cancelled immediately when recognized; see // AwResourceDispatcherHost::CreateResourceHandlerForDownload. However the // download system still tries to start up and calls this before recognizing // the request has been cancelled. diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java index e5a6a203e02535..8ef2bc323b2320 100644 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java @@ -203,6 +203,8 @@ private ProductionSupportedFlagList() {} + " PageTimeSpent."), Flag.baseFeature(BlinkFeatures.FORCE_MAJOR_VERSION100_IN_USER_AGENT, "Force the Chrome major version number to 100 in the User-Agent string."), + Flag.baseFeature(BlinkFeatures.FORCE_MINOR_VERSION100_IN_USER_AGENT, + "Force the Chrome minor version number to 100 in the User-Agent string."), Flag.baseFeature(NetworkServiceFeatures.URL_LOADER_SYNC_CLIENT, "Optimizes communication between URLLoader and CorsURLLoader."), Flag.baseFeature(BlinkFeatures.SET_TIMEOUT_WITHOUT_CLAMP, diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwAutofillTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwAutofillTest.java index e5ac76396d3f3d..47f339cc9fdd7d 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwAutofillTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwAutofillTest.java @@ -918,6 +918,7 @@ public void tearDown() { @Test @SmallTest @Feature({"AndroidWebView"}) + @DisabledTest(message = "https://crbug.com/1279813") public void testTouchingFormWithAdjustResize() throws Throwable { PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> { mRule.getActivity().getWindow().setSoftInputMode( @@ -1146,6 +1147,7 @@ public void testAutofillTriggersAfterReload() throws Throwable { @Test @SmallTest @Feature({"AndroidWebView"}) + @DisabledTest(message = "https://crbug.com/1279813") public void testNotifyVirtualValueChanged() throws Throwable { final String data = "
" + " on_click_outside) : widget_(widget), button_(button), on_click_outside_(on_click_outside) { DCHECK(widget_); - DCHECK(button_); DCHECK(on_click_outside_); Shell::Get()->AddPreTargetHandler(this); } @@ -30,6 +29,10 @@ AppListBubbleEventFilter::~AppListBubbleEventFilter() { Shell::Get()->RemovePreTargetHandler(this); } +void AppListBubbleEventFilter::SetButton(views::View* button) { + button_ = button; +} + void AppListBubbleEventFilter::OnMouseEvent(ui::MouseEvent* event) { if (event->type() == ui::ET_MOUSE_PRESSED) ProcessPressedEvent(*event); @@ -56,10 +59,12 @@ void AppListBubbleEventFilter::ProcessPressedEvent( // Ignore clicks that hit the button (which usually spawned the widget). // Use HitTestPoint() because the shelf home button has a custom view targeter // that handles clicks outside its bounds, like in the corner of the screen. - gfx::Point point_in_button = event_location; - views::View::ConvertPointFromScreen(button_, &point_in_button); - if (button_->HitTestPoint(point_in_button)) - return; + if (button_) { + gfx::Point point_in_button = event_location; + views::View::ConvertPointFromScreen(button_, &point_in_button); + if (button_->HitTestPoint(point_in_button)) + return; + } on_click_outside_.Run(); } diff --git a/ash/app_list/app_list_bubble_event_filter.h b/ash/app_list/app_list_bubble_event_filter.h index b1fbb7d4603948..176579df238efc 100644 --- a/ash/app_list/app_list_bubble_event_filter.h +++ b/ash/app_list/app_list_bubble_event_filter.h @@ -37,6 +37,10 @@ class ASH_EXPORT AppListBubbleEventFilter : public ui::EventHandler { AppListBubbleEventFilter& operator=(const AppListBubbleEventFilter&) = delete; ~AppListBubbleEventFilter() override; + // Changes the button to check (see class comment). Useful if the app list + // has changed displays, so a different home button needs to be checked. + void SetButton(views::View* button); + // ui::EventHandler: void OnMouseEvent(ui::MouseEvent* event) override; void OnTouchEvent(ui::TouchEvent* event) override; @@ -45,7 +49,7 @@ class ASH_EXPORT AppListBubbleEventFilter : public ui::EventHandler { void ProcessPressedEvent(const ui::LocatedEvent& event); views::Widget* const widget_; - views::View* const button_; + views::View* button_; // May be null. base::RepeatingClosure on_click_outside_; }; diff --git a/ash/app_list/app_list_bubble_presenter.cc b/ash/app_list/app_list_bubble_presenter.cc index e98f99920d50c6..1278c09251abbb 100644 --- a/ash/app_list/app_list_bubble_presenter.cc +++ b/ash/app_list/app_list_bubble_presenter.cc @@ -15,6 +15,7 @@ #include "ash/app_list/views/app_list_drag_and_drop_host.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/app_list/app_list_client.h" +#include "ash/public/cpp/app_list/app_list_types.h" #include "ash/public/cpp/assistant/controller/assistant_ui_controller.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shelf/home_button.h" @@ -153,21 +154,31 @@ AppListBubblePresenter::AppListBubblePresenter( } AppListBubblePresenter::~AppListBubblePresenter() { + CHECK(!views::WidgetObserver::IsInObserverList()); +} + +void AppListBubblePresenter::Shutdown() { + DVLOG(1) << __PRETTY_FUNCTION__; // Aborting in-progress animations will run their cleanup callbacks, which // might close the widget. if (bubble_view_) bubble_view_->AbortAllAnimations(); if (bubble_widget_) - bubble_widget_->CloseNow(); - CHECK(!views::WidgetObserver::IsInObserverList()); + bubble_widget_->CloseNow(); // Calls OnWidgetDestroying(). + DCHECK(!bubble_widget_); + DCHECK(!bubble_view_); } void AppListBubblePresenter::Show(int64_t display_id) { DVLOG(1) << __PRETTY_FUNCTION__; - if (bubble_widget_) + if (is_target_visibility_show_) return; - initial_page_ = Page::kApps; + if (bubble_view_) + bubble_view_->AbortAllAnimations(); + + is_target_visibility_show_ = true; + target_page_ = AppListBubblePage::kApps; // Refresh the continue tasks before opening the launcher. If a file doesn't // exist on disk anymore then the launcher should not create or animate the @@ -179,68 +190,78 @@ void AppListBubblePresenter::Show(int64_t display_id) { } void AppListBubblePresenter::OnZeroStateSearchDone(int64_t display_id) { - // Bubble might be open if Show() was called repeatedly. - if (bubble_widget_) - return; - + DVLOG(1) << __PRETTY_FUNCTION__; aura::Window* root_window = Shell::GetRootWindowForDisplayId(display_id); // Display might have disconnected during zero state refresh. if (!root_window) return; - base::TimeTicks time_shown = base::TimeTicks::Now(); - - bubble_widget_ = CreateBubbleWidget(root_window); - bubble_widget_->GetNativeWindow()->SetEventTargeter( - std::make_unique(controller_)); Shelf* shelf = Shelf::ForWindow(root_window); ApplicationDragAndDropHost* drag_and_drop_host = shelf->shelf_widget()->GetDragAndDropHostForAppList(); - bubble_view_ = bubble_widget_->SetContentsView( - std::make_unique(controller_, drag_and_drop_host)); + HomeButton* home_button = shelf->navigation_widget()->GetHomeButton(); + + if (!bubble_widget_) { + // If the bubble widget is null, this is the first show. Construct views. + base::TimeTicks time_shown = base::TimeTicks::Now(); + + bubble_widget_ = CreateBubbleWidget(root_window); + bubble_widget_->GetNativeWindow()->SetEventTargeter( + std::make_unique(controller_)); + bubble_view_ = bubble_widget_->SetContentsView( + std::make_unique(controller_, drag_and_drop_host)); + // Arrow left/right and up/down triggers the same focus movement as + // tab/shift+tab. + bubble_widget_->widget_delegate()->SetEnableArrowKeyTraversal(true); + + bubble_widget_->AddObserver(this); + // Set up event filter to close the bubble for clicks outside the bubble + // that don't cause window activation changes (e.g. clicks on wallpaper or + // blank areas of shelf). + bubble_event_filter_ = std::make_unique( + bubble_widget_, home_button, + base::BindRepeating(&AppListBubblePresenter::OnPressOutsideBubble, + base::Unretained(this))); + + UmaHistogramTimes("Apps.AppListBubbleCreationTime", + base::TimeTicks::Now() - time_shown); + } else { + DCHECK(bubble_view_); + // The bubble widget is cached, but it may change displays. Update pointers + // that are tied to the display. + bubble_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host); + bubble_event_filter_->SetButton(home_button); + // The observer for the correct display will be added below. + aura::client::GetFocusClient(bubble_widget_->GetNativeWindow()) + ->RemoveObserver(this); + } // The widget bounds sometimes depend on the height of the apps grid, so set - // the bounds after creating and setting the contents. + // the bounds after creating and setting the contents. This may cause the + // bubble to change displays. bubble_widget_->SetBounds(ComputeBubbleBounds(root_window, bubble_view_)); - // Arrow left/right and up/down triggers the same focus movement as - // tab/shift+tab. - bubble_widget_->widget_delegate()->SetEnableArrowKeyTraversal(true); + // Bubble launcher is always keyboard traversable. Update every show in case + // we are coming out of tablet mode. + controller_->SetKeyboardTraversalMode(true); - bubble_widget_->AddObserver(this); + // The focus client is tied to the root window, so update the observer every + // time the bubble is shown to make sure it tracks the right display. aura::client::GetFocusClient(bubble_widget_->GetNativeWindow()) ->AddObserver(this); controller_->OnVisibilityWillChange(/*visible=*/true, display_id); bubble_widget_->Show(); // The page must be set before triggering the show animation so the correct // animations are triggered. - if (initial_page_ == Page::kAssistant) { - bubble_view_->ShowEmbeddedAssistantUI(); - } + bubble_view_->ShowPage(target_page_); if (features::IsProductivityLauncherAnimationEnabled()) { bubble_view_->StartShowAnimation(); } controller_->OnVisibilityChanged(/*visible=*/true, display_id); - bubble_view_->FocusSearchBox(); // Must happen after widget creation. - - // Bubble launcher is always keyboard traversable. - controller_->SetKeyboardTraversalMode(true); - - // Set up event filter to close the bubble for clicks outside the bubble that - // don't cause window activation changes (e.g. clicks on wallpaper or blank - // areas of shelf). - HomeButton* home_button = shelf->navigation_widget()->GetHomeButton(); - bubble_event_filter_ = std::make_unique( - bubble_widget_, home_button, - base::BindRepeating(&AppListBubblePresenter::OnPressOutsideBubble, - base::Unretained(this))); - - UmaHistogramTimes("Apps.AppListBubbleCreationTime", - base::TimeTicks::Now() - time_shown); } ShelfAction AppListBubblePresenter::Toggle(int64_t display_id) { DVLOG(1) << __PRETTY_FUNCTION__; - if (bubble_widget_) { + if (is_target_visibility_show_) { Dismiss(); return SHELF_ACTION_APP_LIST_DISMISSED; } @@ -250,25 +271,35 @@ ShelfAction AppListBubblePresenter::Toggle(int64_t display_id) { void AppListBubblePresenter::Dismiss() { DVLOG(1) << __PRETTY_FUNCTION__; - if (!bubble_widget_ || in_hide_animation_) + if (!is_target_visibility_show_) return; + // Check for view because the code could be waiting for zero-state search + // results before first show. + if (bubble_view_) + bubble_view_->AbortAllAnimations(); + + is_target_visibility_show_ = false; + // Reset keyboard traversal in case the user switches to tablet launcher. // Must happen before widget is destroyed. controller_->SetKeyboardTraversalMode(false); controller_->ViewClosing(); - DCHECK(bubble_widget_); // ViewClosing() did not destroy the widget. const int64_t display_id = GetDisplayId(); controller_->OnVisibilityWillChange(/*visible=*/false, display_id); if (features::IsProductivityLauncherAnimationEnabled()) { - in_hide_animation_ = true; - bubble_view_->StartHideAnimation( - base::BindRepeating(&AppListBubblePresenter::OnHideAnimationEnded, - weak_factory_.GetWeakPtr())); + if (bubble_view_) { + bubble_view_->StartHideAnimation( + base::BindOnce(&AppListBubblePresenter::OnHideAnimationEnded, + weak_factory_.GetWeakPtr())); + } } else { - bubble_widget_->CloseNow(); + // Check for widget because the code could be waiting for zero-state search + // results before first show. + if (bubble_widget_) + bubble_widget_->Hide(); } controller_->OnVisibilityChanged(/*visible=*/false, display_id); @@ -278,16 +309,19 @@ void AppListBubblePresenter::Dismiss() { } aura::Window* AppListBubblePresenter::GetWindow() const { - return bubble_widget_ ? bubble_widget_->GetNativeWindow() : nullptr; + return is_target_visibility_show_ && bubble_widget_ + ? bubble_widget_->GetNativeWindow() + : nullptr; } bool AppListBubblePresenter::IsShowing() const { - return !!bubble_widget_; + return is_target_visibility_show_; } bool AppListBubblePresenter::IsShowingEmbeddedAssistantUI() const { - if (!bubble_view_) + if (!is_target_visibility_show_) return false; + DCHECK(bubble_widget_); return bubble_view_->IsShowingEmbeddedAssistantUI(); } @@ -297,17 +331,20 @@ void AppListBubblePresenter::OnTemporarySortOrderChanged( } void AppListBubblePresenter::ShowEmbeddedAssistantUI() { + DVLOG(1) << __PRETTY_FUNCTION__; + target_page_ = AppListBubblePage::kAssistant; // `bubble_view_` does not exist while waiting for zero-state results. // OnZeroStateSearchDone() sets the page in that case. if (bubble_view_) { + DCHECK(bubble_widget_); bubble_view_->ShowEmbeddedAssistantUI(); - } else { - DCHECK(!bubble_widget_); - initial_page_ = Page::kAssistant; } } void AppListBubblePresenter::OnWidgetDestroying(views::Widget* widget) { + DVLOG(1) << __PRETTY_FUNCTION__; + // NOTE: While the widget is usually cached after Show(), this method can be + // called on monitor disconnect. Clean up state. // `bubble_event_filter_` holds a pointer to the widget. bubble_event_filter_.reset(); aura::client::GetFocusClient(bubble_widget_->GetNativeView()) @@ -319,7 +356,7 @@ void AppListBubblePresenter::OnWidgetDestroying(views::Widget* widget) { void AppListBubblePresenter::OnWindowFocused(aura::Window* gained_focus, aura::Window* lost_focus) { - if (!bubble_widget_) + if (!is_target_visibility_show_) return; aura::Window* app_list_container = @@ -357,7 +394,7 @@ void AppListBubblePresenter::OnPressOutsideBubble() { } int64_t AppListBubblePresenter::GetDisplayId() const { - if (!bubble_widget_) + if (!is_target_visibility_show_) return display::kInvalidDisplayId; return display::Screen::GetScreen() ->GetDisplayNearestView(bubble_widget_->GetNativeView()) @@ -365,11 +402,7 @@ int64_t AppListBubblePresenter::GetDisplayId() const { } void AppListBubblePresenter::OnHideAnimationEnded() { - in_hide_animation_ = false; - if (bubble_widget_) - bubble_widget_->CloseNow(); - // OnWidgetDestroyed() resets state. - DCHECK(!bubble_widget_); + bubble_widget_->Hide(); } } // namespace ash diff --git a/ash/app_list/app_list_bubble_presenter.h b/ash/app_list/app_list_bubble_presenter.h index 5c31729aa789e1..11d1efa47ba86b 100644 --- a/ash/app_list/app_list_bubble_presenter.h +++ b/ash/app_list/app_list_bubble_presenter.h @@ -10,6 +10,7 @@ #include #include "ash/ash_export.h" +#include "ash/public/cpp/app_list/app_list_types.h" #include "ash/public/cpp/shelf_types.h" #include "base/memory/weak_ptr.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -41,6 +42,9 @@ class ASH_EXPORT AppListBubblePresenter AppListBubblePresenter& operator=(const AppListBubblePresenter&) = delete; ~AppListBubblePresenter() override; + // Closes the bubble if it is open and prepares for shutdown. + void Shutdown(); + // Shows the bubble on the display with `display_id`. The bubble is shown // asynchronously (after a delay) because the continue suggestions need to be // refreshed before the bubble views can be created and animated. This delay @@ -86,9 +90,6 @@ class ASH_EXPORT AppListBubblePresenter AppListBubbleView* bubble_view_for_test() { return bubble_view_; } private: - // The code doesn't need a value for the search page. - enum class Page { kApps, kAssistant }; - // Callback for zero state search update. Builds the bubble widget and views // on display `display_id` and triggers the show animation. void OnZeroStateSearchDone(int64_t display_id); @@ -106,17 +107,18 @@ class ASH_EXPORT AppListBubblePresenter AppListControllerImpl* const controller_; + // Whether the view is showing or animating to shown. If true, + // `bubble_widget_` is not null. + bool is_target_visibility_show_ = false; + // Owned by native widget. views::Widget* bubble_widget_ = nullptr; // Owned by views. AppListBubbleView* bubble_view_ = nullptr; - // Whether the bubble hide animation is playing. - bool in_hide_animation_ = false; - // The page to show after the views are constructed. - Page initial_page_ = Page::kApps; + AppListBubblePage target_page_ = AppListBubblePage::kApps; // Closes the widget when the user clicks outside of it. std::unique_ptr bubble_event_filter_; diff --git a/ash/app_list/app_list_bubble_presenter_unittest.cc b/ash/app_list/app_list_bubble_presenter_unittest.cc index a1bf8855be741c..75c47b23cb5160 100644 --- a/ash/app_list/app_list_bubble_presenter_unittest.cc +++ b/ash/app_list/app_list_bubble_presenter_unittest.cc @@ -11,6 +11,7 @@ #include "ash/app_list/test_app_list_client.h" #include "ash/app_list/views/app_list_bubble_apps_page.h" #include "ash/app_list/views/app_list_bubble_view.h" +#include "ash/app_list/views/search_box_view.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/test/app_list_test_api.h" @@ -31,11 +32,10 @@ #include "ui/display/display.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/geometry/vector2d.h" -#include "ui/views/test/widget_test.h" +#include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" using views::Widget; -using views::test::WidgetDestroyedWaiter; namespace ash { namespace { @@ -63,11 +63,11 @@ gfx::Rect GetShelfBounds() { ->GetWindowBoundsInScreen(); } -// Returns the number of widgets in the app list container on the primary -// display. -size_t NumberOfWidgetsInAppListContainer() { - aura::Window* container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), kShellWindowId_AppListContainer); +// Returns the number of widgets in the app list container for `display_id`. +size_t NumberOfWidgetsInAppListContainer(int64_t display_id) { + aura::Window* root = Shell::GetRootWindowForDisplayId(display_id); + aura::Window* container = + Shell::GetContainer(root, kShellWindowId_AppListContainer); std::set widgets; views::Widget::GetAllChildWidgets(container, &widgets); return widgets.size(); @@ -97,6 +97,11 @@ class AppListBubblePresenterTest : public AshTestBase { void AddAppItems(int num_items) { GetAppListTestHelper()->AddAppItems(num_items); + auto* presenter = GetBubblePresenter(); + if (presenter->bubble_widget_for_test()) { + // Widget is cached between shows, so adding apps may require layout. + presenter->bubble_widget_for_test()->LayoutRootViewIfNecessary(); + } } base::test::ScopedFeatureList scoped_features_; @@ -107,7 +112,7 @@ TEST_F(AppListBubblePresenterTest, ShowOpensOneWidgetInAppListContainer) { AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Show(GetPrimaryDisplay().id()); - EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer()); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); } TEST_F(AppListBubblePresenterTest, ShowStartsZeroStateSearch) { @@ -129,18 +134,85 @@ TEST_F(AppListBubblePresenterTest, ShowRecordsCreationTimeHistogram) { presenter->Dismiss(); presenter->Show(GetPrimaryDisplay().id()); - histogram_tester.ExpectTotalCount("Apps.AppListBubbleCreationTime", 2); + // The widget is cached, so the metric was not recorded again. + histogram_tester.ExpectTotalCount("Apps.AppListBubbleCreationTime", 1); } -TEST_F(AppListBubblePresenterTest, DismissClosesWidget) { +TEST_F(AppListBubblePresenterTest, ShowOnSecondaryDisplay) { + UpdateDisplay("1600x1200,1366x768"); + AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Show(GetPrimaryDisplay().id()); + presenter->Dismiss(); + + presenter->Show(GetSecondaryDisplay().id()); + EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetSecondaryDisplay().id())); +} + +TEST_F(AppListBubblePresenterTest, ToggleWithHomeButtonOnSecondaryDisplay) { + // Set up 2 displays. + UpdateDisplay("1366x768,1920x1080"); - WidgetDestroyedWaiter waiter(presenter->bubble_widget_for_test()); + // Show and hide the widget on the primary display. This forces it to be + // cached. + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetPrimaryDisplay().id()); presenter->Dismiss(); - waiter.Wait(); + ASSERT_EQ(1u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + // Click the home button on the secondary display. + aura::Window* root = + Shell::GetRootWindowForDisplayId(GetSecondaryDisplay().id()); + HomeButton* button = + Shelf::ForWindow(root)->navigation_widget()->GetHomeButton(); + GetEventGenerator()->MoveMouseTo(button->GetBoundsInScreen().CenterPoint()); + GetEventGenerator()->ClickLeftButton(); + + // Widget is shown. + EXPECT_TRUE(presenter->IsShowing()); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetSecondaryDisplay().id())); + + // Click the home button again. + GetEventGenerator()->ClickLeftButton(); + + // Widget is hidden. + EXPECT_FALSE(presenter->IsShowing()); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetSecondaryDisplay().id())); +} + +TEST_F(AppListBubblePresenterTest, ShowAfterDisconnectingDisplay) { + // Set up 2 displays. + UpdateDisplay("1366x768,1920x1080"); + + // Show and hide the widget on the secondary display. This forces it to be + // cached. + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetSecondaryDisplay().id()); + presenter->Dismiss(); + ASSERT_EQ(1u, NumberOfWidgetsInAppListContainer(GetSecondaryDisplay().id())); + + // Disconnect the secondary monitor. + UpdateDisplay("1366x768"); + + // Show the widget on the primary display. + presenter->Show(GetPrimaryDisplay().id()); + + // Widget is shown (and no crash). + EXPECT_TRUE(presenter->IsShowing()); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); +} + +TEST_F(AppListBubblePresenterTest, DismissHidesWidget) { + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetPrimaryDisplay().id()); + + presenter->Dismiss(); + + // The widget still exists. It was cached for performance. + views::Widget* widget = presenter->bubble_widget_for_test(); + ASSERT_TRUE(widget); + EXPECT_FALSE(widget->IsVisible()); } TEST_F(AppListBubblePresenterTest, DismissWhenNotShowingDoesNotCrash) { @@ -155,18 +227,19 @@ TEST_F(AppListBubblePresenterTest, ToggleOpensOneWidgetInAppListContainer) { AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Toggle(GetPrimaryDisplay().id()); - EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer()); + EXPECT_EQ(1u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); } -TEST_F(AppListBubblePresenterTest, ToggleClosesWidgetInAppListContainer) { +TEST_F(AppListBubblePresenterTest, ToggleHidesWidgetInAppListContainer) { AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Toggle(GetPrimaryDisplay().id()); + ASSERT_EQ(1u, NumberOfWidgetsInAppListContainer(GetPrimaryDisplay().id())); - WidgetDestroyedWaiter waiter(presenter->bubble_widget_for_test()); presenter->Toggle(GetPrimaryDisplay().id()); - waiter.Wait(); - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + views::Widget* widget = presenter->bubble_widget_for_test(); + ASSERT_TRUE(widget); + EXPECT_FALSE(widget->IsVisible()); } TEST_F(AppListBubblePresenterTest, BubbleIsNotShowingByDefault) { @@ -193,7 +266,7 @@ TEST_F(AppListBubblePresenterTest, BubbleIsNotShowingAfterDismiss) { EXPECT_FALSE(presenter->GetWindow()); } -TEST_F(AppListBubblePresenterTest, CannotShowWhileAnimatingClosed) { +TEST_F(AppListBubblePresenterTest, CanShowWhileAnimatingClosed) { AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Show(GetPrimaryDisplay().id()); @@ -203,17 +276,42 @@ TEST_F(AppListBubblePresenterTest, CannotShowWhileAnimatingClosed) { ui::ScopedAnimationDurationScaleMode duration( ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); - WidgetDestroyedWaiter waiter(presenter->bubble_widget_for_test()); presenter->Dismiss(); - // Widget is still showing because it is animating closed. - EXPECT_TRUE(presenter->IsShowing()); + // Widget is not considered showing because it is animating closed. + EXPECT_FALSE(presenter->IsShowing()); + // Widget is still visible because the animation is still playing. + EXPECT_TRUE(presenter->bubble_widget_for_test()->IsVisible()); // Attempt to abort the dismiss by showing again. presenter->Show(GetPrimaryDisplay().id()); - // Widget closes anyway. - waiter.Wait(); - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + // Widget shows. + EXPECT_TRUE(presenter->IsShowing()); +} + +TEST_F(AppListBubblePresenterTest, DismissWhileWaitingForZeroStateSearch) { + // Simulate production behavior for animations and zero-state search results. + base::test::ScopedFeatureList features( + features::kProductivityLauncherAnimation); + ui::ScopedAnimationDurationScaleMode duration( + ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); + GetTestAppListClient()->set_run_zero_state_callback_immediately(false); + + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetPrimaryDisplay().id()); + EXPECT_EQ(1, GetTestAppListClient()->start_zero_state_search_count()); + + // Dismiss while the code is waiting for the zero-state results. The widget + // is not created. + presenter->Dismiss(); + EXPECT_FALSE(presenter->IsShowing()); + EXPECT_FALSE(presenter->bubble_widget_for_test()); + + // Show and wait for the show to finish. + presenter->Show(GetPrimaryDisplay().id()); + AppListTestApi().WaitForBubbleWindow(/*wait_for_opening_animation=*/true); + EXPECT_TRUE(presenter->IsShowing()); + EXPECT_TRUE(presenter->bubble_widget_for_test()); } // Regression test for https://crbug.com/1275755 @@ -237,6 +335,30 @@ TEST_F(AppListBubblePresenterTest, AssistantKeyOpensToAssistantPage) { EXPECT_TRUE(presenter->IsShowingEmbeddedAssistantUI()); } +TEST_F(AppListBubblePresenterTest, AssistantKeyOpensAssistantPageWhenCached) { + // Show and hide the widget to force it to be cached. + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetPrimaryDisplay().id()); + presenter->Dismiss(); + + // Simulate production behavior for animations, assistant, and zero-state + // search results. + base::test::ScopedFeatureList features( + features::kProductivityLauncherAnimation); + ui::ScopedAnimationDurationScaleMode duration( + ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION); + assistant_test_api_->EnableAssistantAndWait(); + GetTestAppListClient()->set_run_zero_state_callback_immediately(false); + + PressAndReleaseKey(ui::VKEY_ASSISTANT); + AppListTestApi().WaitForBubbleWindow(/*wait_for_opening_animation=*/false); + + EXPECT_TRUE(presenter->IsShowing()); + EXPECT_FALSE( + presenter->bubble_view_for_test()->apps_page_for_test()->GetVisible()); + EXPECT_TRUE(presenter->IsShowingEmbeddedAssistantUI()); +} + TEST_F(AppListBubblePresenterTest, SearchKeyOpensToAppsPage) { // Simulate production behavior for animations, assistant, and zero-state // search results. @@ -257,6 +379,26 @@ TEST_F(AppListBubblePresenterTest, SearchKeyOpensToAppsPage) { EXPECT_FALSE(presenter->IsShowingEmbeddedAssistantUI()); } +TEST_F(AppListBubblePresenterTest, SearchFieldHasFocusAfterAssistantPageShown) { + // Search box takes focus on show. + AppListBubblePresenter* presenter = GetBubblePresenter(); + presenter->Show(GetPrimaryDisplay().id()); + auto* search_box_view = GetAppListTestHelper()->GetBubbleSearchBoxView(); + EXPECT_TRUE(search_box_view->search_box()->HasFocus()); + + // Switch to assistant page. Search box loses focus. + presenter->ShowEmbeddedAssistantUI(); + EXPECT_FALSE(search_box_view->search_box()->HasFocus()); + + // The widget is still open, but hidden. + presenter->Dismiss(); + EXPECT_FALSE(search_box_view->search_box()->HasFocus()); + + // Focus returns to the main search box on show. + presenter->Show(GetPrimaryDisplay().id()); + EXPECT_TRUE(search_box_view->search_box()->HasFocus()); +} + TEST_F(AppListBubblePresenterTest, DoesNotCrashWhenNativeWidgetDestroyed) { AppListBubblePresenter* presenter = GetBubblePresenter(); presenter->Show(GetPrimaryDisplay().id()); @@ -279,13 +421,11 @@ TEST_F(AppListBubblePresenterTest, ClickInTopLeftOfScreenClosesBubble) { presenter->Show(GetPrimaryDisplay().id()); Widget* widget = presenter->bubble_widget_for_test(); - WidgetDestroyedWaiter waiter(widget); ASSERT_FALSE(widget->GetWindowBoundsInScreen().Contains(0, 0)); GetEventGenerator()->MoveMouseTo(0, 0); GetEventGenerator()->ClickLeftButton(); - waiter.Wait(); - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + EXPECT_FALSE(presenter->IsShowing()); } // Verifies that the launcher does not reopen when it's closed by a click on the @@ -295,13 +435,11 @@ TEST_F(AppListBubblePresenterTest, ClickOnHomeButtonClosesBubble) { presenter->Show(GetPrimaryDisplay().id()); // Click the home button. - WidgetDestroyedWaiter waiter(presenter->bubble_widget_for_test()); HomeButton* button = GetPrimaryShelf()->navigation_widget()->GetHomeButton(); GetEventGenerator()->MoveMouseTo(button->GetBoundsInScreen().CenterPoint()); GetEventGenerator()->ClickLeftButton(); - waiter.Wait(); - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + EXPECT_FALSE(presenter->IsShowing()); } // Regression test for https://crbug.com/1237264. @@ -310,13 +448,11 @@ TEST_F(AppListBubblePresenterTest, ClickInCornerOfScreenClosesBubble) { presenter->Show(GetPrimaryDisplay().id()); // Click the bottom left corner of the screen. - WidgetDestroyedWaiter waiter(presenter->bubble_widget_for_test()); GetEventGenerator()->MoveMouseTo(GetPrimaryDisplay().bounds().bottom_left()); GetEventGenerator()->ClickLeftButton(); - waiter.Wait(); // Bubble is closed (and did not reopen). - EXPECT_EQ(0u, NumberOfWidgetsInAppListContainer()); + EXPECT_FALSE(presenter->IsShowing()); } // Regression test for https://crbug.com/1268220. diff --git a/ash/app_list/app_list_controller_impl.cc b/ash/app_list/app_list_controller_impl.cc index db188c86d1b849..8719724aa9a9b0 100644 --- a/ash/app_list/app_list_controller_impl.cc +++ b/ash/app_list/app_list_controller_impl.cc @@ -930,6 +930,7 @@ void AppListControllerImpl::OnUiVisibilityChanged( switch (new_visibility) { case AssistantVisibility::kVisible: + DVLOG(1) << "Assistant becoming visible"; if (!IsVisible() || is_old_visibility_closing) { absl::optional disabler; if (is_old_visibility_closing) { @@ -1081,8 +1082,12 @@ void AppListControllerImpl::SetKeyboardTraversalMode(bool engaged) { if (bubble_presenter_ && bubble_presenter_->IsShowing()) return; + AppListView* app_list_view = fullscreen_presenter_->GetView(); + // May be null in tests of bubble presenter. + if (!app_list_view) + return; views::View* focused_view = - fullscreen_presenter_->GetView()->GetFocusManager()->GetFocusedView(); + app_list_view->GetFocusManager()->GetFocusedView(); if (!focused_view) return; @@ -1941,6 +1946,9 @@ void AppListControllerImpl::Shutdown() { DCHECK(!is_shutdown_); is_shutdown_ = true; + if (bubble_presenter_) + bubble_presenter_->Shutdown(); + Shell* shell = Shell::Get(); AssistantController::Get()->RemoveObserver(this); AssistantUiController::Get()->GetModel()->RemoveObserver(this); diff --git a/ash/app_list/views/app_list_bubble_view.cc b/ash/app_list/views/app_list_bubble_view.cc index 23ffa75766ada5..936b2b03709cca 100644 --- a/ash/app_list/views/app_list_bubble_view.cc +++ b/ash/app_list/views/app_list_bubble_view.cc @@ -30,6 +30,7 @@ #include "ash/search_box/search_box_constants.h" #include "ash/style/ash_color_provider.h" #include "ash/system/tray/tray_constants.h" +#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/cxx17_backports.h" @@ -41,6 +42,7 @@ #include "ui/compositor/animation_throughput_reporter.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_type.h" +#include "ui/events/types/event_type.h" #include "ui/gfx/animation/tween.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h" @@ -147,6 +149,15 @@ AppListBubbleView::~AppListBubbleView() { folder_view_ = nullptr; } +void AppListBubbleView::SetDragAndDropHostOfCurrentAppList( + ApplicationDragAndDropHost* drag_and_drop_host) { + DCHECK(drag_and_drop_host); + apps_page_->scrollable_apps_grid_view()->SetDragAndDropHostOfCurrentAppList( + drag_and_drop_host); + folder_view_->items_grid_view()->SetDragAndDropHostOfCurrentAppList( + drag_and_drop_host); +} + void AppListBubbleView::InitContentsView( ApplicationDragAndDropHost* drag_and_drop_host) { auto* contents = AddChildView(std::make_unique()); @@ -232,6 +243,10 @@ void AppListBubbleView::StartShowAnimation() { // Animate the layer to fully opaque at its target bounds. views::AnimationBuilder() + .OnEnded(base::BindOnce(&AppListBubbleView::OnShowAnimationEnded, + weak_factory_.GetWeakPtr(), target_bounds)) + .OnAborted(base::BindOnce(&AppListBubbleView::OnShowAnimationEnded, + weak_factory_.GetWeakPtr(), target_bounds)) .Once() .SetDuration(base::Milliseconds(150)) .SetBounds(layer(), target_bounds, gfx::Tween::LINEAR_OUT_SLOW_IN) @@ -247,7 +262,9 @@ void AppListBubbleView::StartShowAnimation() { } void AppListBubbleView::StartHideAnimation( - base::RepeatingClosure on_animation_ended) { + base::OnceClosure on_animation_ended) { + on_hide_animation_ended_ = std::move(on_animation_ended); + // Ensure any in-progress animations have their cleanup callbacks called. AbortAllAnimations(); @@ -278,8 +295,10 @@ void AppListBubbleView::StartHideAnimation( apps_page_->StartHideAnimation(); views::AnimationBuilder() - .OnEnded(on_animation_ended) - .OnAborted(on_animation_ended) + .OnEnded(base::BindOnce(&AppListBubbleView::OnHideAnimationEnded, + weak_factory_.GetWeakPtr(), target_bounds)) + .OnAborted(base::BindOnce(&AppListBubbleView::OnHideAnimationEnded, + weak_factory_.GetWeakPtr(), target_bounds)) .Once() .SetDuration(base::Milliseconds(100)) .SetBounds(layer(), final_bounds, gfx::Tween::FAST_OUT_LINEAR_IN) @@ -304,9 +323,30 @@ bool AppListBubbleView::Back() { return false; } -void AppListBubbleView::FocusSearchBox() { - DCHECK(GetWidget()); - search_box_view_->SetSearchBoxActive(true, /*event_type=*/ui::ET_UNKNOWN); +void AppListBubbleView::ShowPage(AppListBubblePage page) { + DVLOG(1) << __PRETTY_FUNCTION__ << " page " << static_cast(page); + // The assistant has its own text input field. + search_box_view_->SetVisible(page != AppListBubblePage::kAssistant); + separator_->SetVisible(page != AppListBubblePage::kAssistant); + + apps_page_->SetVisible(page == AppListBubblePage::kApps); + search_page_->SetVisible(page == AppListBubblePage::kSearch); + search_page_dialog_controller_->SetEnabled(page == + AppListBubblePage::kSearch); + assistant_page_->SetVisible(page == AppListBubblePage::kAssistant); + switch (page) { + case AppListBubblePage::kApps: + case AppListBubblePage::kSearch: + search_box_view_->SetSearchBoxActive(true, /*event_type=*/ui::ET_UNKNOWN); + break; + case AppListBubblePage::kAssistant: + // Explicitly set search box inactive so the next attempt to active it + // will succeed. + search_box_view_->SetSearchBoxActive(false, + /*event_type=*/ui::ET_UNKNOWN); + assistant_page_->RequestFocus(); + break; + } } bool AppListBubbleView::IsShowingEmbeddedAssistantUI() const { @@ -316,16 +356,7 @@ bool AppListBubbleView::IsShowingEmbeddedAssistantUI() const { void AppListBubbleView::ShowEmbeddedAssistantUI() { if (IsShowingEmbeddedAssistantUI()) return; - - // The assistant has its own text input field. - search_box_view_->SetVisible(false); - separator_->SetVisible(false); - - apps_page_->SetVisible(false); - search_page_->SetVisible(false); - search_page_dialog_controller_->SetEnabled(false); - assistant_page_->SetVisible(true); - assistant_page_->RequestFocus(); + ShowPage(AppListBubblePage::kAssistant); } int AppListBubbleView::GetHeightToFitAllApps() const { @@ -495,4 +526,19 @@ void AppListBubbleView::DisableFocusForShowingActiveFolder(bool disabled) { apps_page_->DisableFocusForShowingActiveFolder(disabled); } +void AppListBubbleView::OnShowAnimationEnded(const gfx::Rect& layer_bounds) { + // Restore the layer bounds. If the animation completed normally, this isn't + // visible because the bounds won't change. If the animation was aborted, this + // is needed to reset state before starting the hide animation. + layer()->SetBounds(layer_bounds); +} + +void AppListBubbleView::OnHideAnimationEnded(const gfx::Rect& layer_bounds) { + // Restore the layer bounds. This isn't visible because opacity is 0. + layer()->SetBounds(layer_bounds); + + if (on_hide_animation_ended_) + std::move(on_hide_animation_ended_).Run(); +} + } // namespace ash diff --git a/ash/app_list/views/app_list_bubble_view.h b/ash/app_list/views/app_list_bubble_view.h index ed679b71665bb0..aa7837c8e13ba9 100644 --- a/ash/app_list/views/app_list_bubble_view.h +++ b/ash/app_list/views/app_list_bubble_view.h @@ -9,8 +9,10 @@ #include "ash/app_list/views/app_list_folder_controller.h" #include "ash/ash_export.h" +#include "ash/public/cpp/app_list/app_list_types.h" #include "ash/search_box/search_box_view_delegate.h" #include "base/callback_forward.h" +#include "base/memory/weak_ptr.h" #include "ui/views/view.h" namespace ash { @@ -41,11 +43,16 @@ class ASH_EXPORT AppListBubbleView : public views::View, AppListBubbleView& operator=(const AppListBubbleView&) = delete; ~AppListBubbleView() override; + // If |drag_and_drop_host| is not nullptr it will be called upon drag and drop + // operations outside the app list (e.g. to the shelf). + void SetDragAndDropHostOfCurrentAppList( + ApplicationDragAndDropHost* drag_and_drop_host); + // Starts the bubble show animation. void StartShowAnimation(); // Starts the bubble hide animation. - void StartHideAnimation(base::RepeatingClosure on_animation_ended); + void StartHideAnimation(base::OnceClosure on_hide_animation_ended); // Aborts all layer animations started by StartShowAnimation() or // StartHideAnimation(). This invokes their cleanup callbacks. @@ -54,8 +61,8 @@ class ASH_EXPORT AppListBubbleView : public views::View, // Handles back action if it we have a use for it besides dismissing. bool Back(); - // Focuses the search box text input field. - void FocusSearchBox(); + // Shows a sub-page. + void ShowPage(AppListBubblePage page); // Returns true if the assistant page is showing. bool IsShowingEmbeddedAssistantUI() const; @@ -108,6 +115,12 @@ class ASH_EXPORT AppListBubbleView : public views::View, // `disabled` is true, such that focus is contained in the folder view. void DisableFocusForShowingActiveFolder(bool disabled); + // Called when the show animation ends or aborts. + void OnShowAnimationEnded(const gfx::Rect& layer_bounds); + + // Called when the hide animation ends or aborts. + void OnHideAnimationEnded(const gfx::Rect& layer_bounds); + AppListViewDelegate* const view_delegate_; std::unique_ptr a11y_announcer_; @@ -132,6 +145,11 @@ class ASH_EXPORT AppListBubbleView : public views::View, // folder_view_->GetVisible() because the view is "visible" but hidden when // dragging an item out of a folder. bool showing_folder_ = false; + + // Called after the hide animation ends or aborts. + base::OnceClosure on_hide_animation_ended_; + + base::WeakPtrFactory weak_factory_{this}; }; } // namespace ash diff --git a/ash/public/cpp/app_list/app_list_types.h b/ash/public/cpp/app_list/app_list_types.h index b97743f388f87e..f2d23360cc0112 100644 --- a/ash/public/cpp/app_list/app_list_types.h +++ b/ash/public/cpp/app_list/app_list_types.h @@ -187,6 +187,9 @@ enum class AppListState { kStateLast = kInvalidState, // Don't use over IPC }; +// Sub-pages of the app list bubble (with ProductivityLauncher). +enum class AppListBubblePage { kApps, kSearch, kAssistant }; + // All possible states of the app list view. enum class AppListViewState { // Closes |app_list_main_view_| and dismisses the delegate. diff --git a/ash/strings/ash_strings_ja.xtb b/ash/strings/ash_strings_ja.xtb index a59b4da4a8ad95..3b581d6ed12b63 100644 --- a/ash/strings/ash_strings_ja.xtb +++ b/ash/strings/ash_strings_ja.xtb @@ -192,6 +192,7 @@ デスク 7 保護されたコンテンツが表示されているときは、画面を録画できません デバイスをスキャンしています... + のダウンロード中にエラーが発生しました Bluetooth オフ すべてログアウト アプリケーションがマイクを使用しています @@ -587,6 +588,7 @@ 自動クリックをオフにしてもよろしいですか? キーボードのフォーカスがある項目をハイライト表示する なし(一時停止) + をダウンロードするには、ネットワーク接続を確認してください ダウンロードは後で試行されます。音声はダウンロードが完了するまで処理のために Google に送信されます。 有効 Alt+ 検索/Shift @@ -804,6 +806,7 @@ 拒否 言語が変更されました へ画面を拡張しています +ファイルをダウンロードできません 全画面拡大鏡 USB-C デバイス(右側面のポート) が期限までに を更新するよう求めています @@ -816,6 +819,8 @@ 絵文字 信号強度 、電池残量 にキャストしています + +新たなインストール 管理者に問い合わせる eSIM 接続を利用できません {0,plural, =1{1 時間以内にデバイスを更新してください}other{# 時間以内にデバイスを更新してください}} @@ -847,6 +852,7 @@ 電源 接続済み、% のバッテリー残量 + +設定に移動 管理者によって適用 パフォーマンス追跡機能が有効になっています デスク が削除されデスク に統合されました @@ -983,6 +989,7 @@ 設定するにはタップします VPN 新しいモバイル ネットワークを追加 +再試行 {NUM_NOTIFICATIONS,plural, =1{1 件の通知}other{# 件の通知}} 切り取り シェルフのアプリを表示 @@ -1169,6 +1176,7 @@ HSPA を使用しています 通知に関する操作を行うには、 でデバイスのロックを解除してください +ストレージを管理 ファミリー リンクの保護者のアクセスコードを入力してください。 全画面表示 の設定を開く @@ -1214,6 +1222,7 @@ カレンダーに予定は入ってる? フィードバックを送信 同意しない + をダウンロードするのに十分な容量がありません。容量を空けてください。 の検索結果 件を表示しています 」のウィンドウを閉じました。 diff --git a/ash/strings/ash_strings_km.xtb b/ash/strings/ash_strings_km.xtb index f7a04a4000e73f..708a6463400f4e 100644 --- a/ash/strings/ash_strings_km.xtb +++ b/ash/strings/ash_strings_km.xtb @@ -623,6 +623,7 @@ ចាប់ផ្ដើម​អក្សររត់ លេខសម្គាល់មិនត្រឹមត្រូវ ដោះសោ​មុខងារ​ជំនួយការ​ជាច្រើនទៀត។ +កំណត់ផ្ទាល់ខ្លួន បង្ហាញខែបន្ទាប់ បាន​ភ្ជាប់​ក្ដារចុច​ផ្សេង បានដោះសោ diff --git a/ash/strings/ash_strings_ky.xtb b/ash/strings/ash_strings_ky.xtb index ded092eb5c726c..c5cdb3e45acfd6 100644 --- a/ash/strings/ash_strings_ky.xtb +++ b/ash/strings/ash_strings_ky.xtb @@ -192,6 +192,7 @@ 7-иш такта Корголгон мазмун көрүнүп турганда экрандагыны жаздырып алууга болбойт Түзмөктөр изделүүдө… + файлын жүктөп алып жатканда бир жерден ката кетти Bluetooth өчүрүлдү Баарын чыгаруу Колдонмо микрофонуңузду колдонуп жатат @@ -587,6 +588,7 @@ Автоматтык түрдө чыкылдатууларды чын эле өчүргүңүз келеби? Баскычтоп менен тандалган элементтер баса белгиленсин Эч кандай аракет аткарылбасын (тындыруу) + файлын жүктөп алуу үчүн тармакка туташууну текшериңиз Жүктөп алууга кийинчерээк аракет жасалат. Жүктөлүп алынганга чейин иштетүү үчүн кеп Google'га жөнөтүлөт. жандырылды Alt+Search же Shift @@ -804,6 +806,7 @@ Четке кагуу Тил өзгөртүлдү Экран карай кеңейтилүүдө +Файлды жүктөп алууга болбойт Толук экран режиминдеги лупа USB-C түзмөгү (оң жактагы оюкча) түзмөгүңүздү мөөнөтү бүткөнгө чейин жаңыртууну талап кылууда @@ -817,6 +820,8 @@ Сигналдын күчү , Телефондун батареясы Скандалган жүктөлүп алынууда экранына чыгаруу + +Жаңы колдонмо орнотулду Администраторго кайрылыңыз eSIM-картага туташуу жеткиликсиз {0,plural, =1{Түзмөктү бир сааттын ичинде жаңыртыңыз}other{Түзмөктү # сааттын ичинде жаңыртыңыз}} @@ -848,6 +853,7 @@ Кубат Туташып турат, батареянын деңгээли – % дагы +ЖӨНДӨӨЛӨРГӨ ӨТҮҮ Администраторуңуз ишке киргизди Майнаптуулукка көз салуу күйгүзүлгөн иш тактасы өчүрүлдү жана иш тактасы менен бириктирилди @@ -983,6 +989,7 @@ Конфигурациялоо үчүн таптап коюңуз VPN Жаңы мобилдик тармакты кошуу +КАЙТАЛОО {NUM_NOTIFICATIONS,plural, =1{1 билдирме}other{# билдирме}} Кесүү Текчедеги колдонмолорду көрсөтүү @@ -1169,6 +1176,7 @@ HSPA колдонулууда Билдирмедеги аракетти аткаруу үчүн түзмөктүн кулпусун катары ачыңыз +САКТАГЫЧТЫ БАШКАРУУ Family Link'ке ата-эненин кодун киргизиңиз. толук экран тармагынын жөндөөлөрүн ачуу @@ -1214,6 +1222,7 @@ Жылнаамада эмне бар? Пикириңизди билдириңиз Четке кагуу + үчүн орун жетишсиз. Орун бошотуңуз. сурамы боюнча натыйжа көрсөтүлүүдө Туурасынан терезеси жабылды. diff --git a/ash/strings/ash_strings_mn.xtb b/ash/strings/ash_strings_mn.xtb index ef2ece1a0b362a..34b004d7d29184 100644 --- a/ash/strings/ash_strings_mn.xtb +++ b/ash/strings/ash_strings_mn.xtb @@ -622,6 +622,7 @@ Хаалттай тайлбаруудыг эхлүүлэх ПИН код буруу байна Tуслахын бусад онцлогийн түгжээг тайлна уу. +Хувийн болгох Дараагийн сарыг харуулах Өөр гар холбосон Түгжээг тайлсан @@ -816,6 +817,7 @@ Бүү саад бол Эможи Дохионы хүч , утасны батарей +Татах -г скан хийж байна -д дамжуулж байна Админаас асуух eSIM холболт боломжгүй diff --git a/ash/strings/ash_strings_th.xtb b/ash/strings/ash_strings_th.xtb index 995ed10d375581..240f68e53993ba 100644 --- a/ash/strings/ash_strings_th.xtb +++ b/ash/strings/ash_strings_th.xtb @@ -192,6 +192,7 @@ เดสก์ 7 ไม่อนุญาตให้บันทึกหน้าจอเมื่อมีเนื้อหาที่ได้รับการคุ้มครองแสดงอยู่ กำลังสแกนหาอุปกรณ์... +เกิดข้อผิดพลาดขณะดาวน์โหลด ปิดใช้งานบลูทูธแล้ว ออกจากระบบทั้งหมด มีแอปพลิเคชันกำลังใช้ไมโครโฟน @@ -587,6 +588,7 @@ แน่ใจไหมว่าต้องการปิดการคลิกอัตโนมัติ ไฮไลต์วัตถุที่มีโฟกัสแป้นพิมพ์ ไม่มีการดำเนินการ (หยุดชั่วคราว) +ตรวจสอบการเชื่อมต่อเครือข่ายเพื่อดาวน์โหลด ระบบจะพยายามดาวน์โหลดภายหลัง โดยจะส่งคำพูดไปประมวลผลที่ Google จนกว่าจะดาวน์โหลดเสร็จ เปิดใช้งานอยู่ Alt+ค้นหา หรือ Shift @@ -804,6 +806,7 @@ ปฏิเสธ เปลี่ยนภาษาแล้ว ขยายหน้าจอไปยัง +ดาวน์โหลดไฟล์ไม่ได้ แว่นขยายทั้งหน้าจอ อุปกรณ์ USB-C (พอร์ตด้านขวา) กำหนดให้คุณต้องอัปเดต ก่อนเวลาที่กำหนด @@ -815,7 +818,10 @@ ห้ามรบกวน อีโมจิ ความแรงสัญญาณ , แบตเตอรี่โทรศัพท์ +กำลังสแกน เพื่อดาวน์โหลด แคสต์ไปที่ + +ติดตั้งใหม่ ถามผู้ดูแลระบบ การเชื่อมต่อ eSIM ไม่พร้อมใช้งาน {0,plural, =1{อัปเดตอุปกรณ์ภายใน 1 ชั่วโมง}other{อัปเดตอุปกรณ์ภายใน # ชั่วโมง}} @@ -847,6 +853,7 @@ พลังงาน เชื่อมต่อแล้ว แบตเตอรี่ % + +ไปที่การตั้งค่า บังคับใช้โดยผู้ดูแลระบบของคุณ การติดตามประสิทธิภาพเปิดอยู่ นำเดสก์ ออกและรวมเข้ากับเดสก์ แล้ว @@ -982,6 +989,7 @@ แตะเพื่อกำหนดค่า VPN เพิ่มเครือข่ายมือถือใหม่ +ลองอีกครั้ง {NUM_NOTIFICATIONS,plural, =1{การแจ้งเตือน 1 รายการ}other{การแจ้งเตือน # รายการ}} ตัด แสดงแอปในแถบ @@ -1168,6 +1176,7 @@ HSPA กำลังใช้ ปลดล็อกอุปกรณ์โดยใช้ เพื่อดำเนินการแจ้งเตือน +จัดการพื้นที่เก็บข้อมูล ป้อนรหัสการเข้าถึง Family Link ของผู้ปกครอง เต็มหน้าจอ เปิดการตั้งค่าสำหรับ @@ -1213,6 +1222,7 @@ มีอะไรในปฏิทินของฉันบ้าง ส่งความคิดเห็น ปฏิเสธ +มีพื้นที่ไม่เพียงพอสำหรับ เพิ่มพื้นที่ว่าง กำลังแสดงผลการค้นหา รายการสำหรับ "" แนวนอน ปิดหน้าต่าง แล้ว diff --git a/ash/strings/ash_strings_uz.xtb b/ash/strings/ash_strings_uz.xtb index 1e027e6c79b999..6213560be1ab79 100644 --- a/ash/strings/ash_strings_uz.xtb +++ b/ash/strings/ash_strings_uz.xtb @@ -623,6 +623,7 @@ Quyidagi narsalardan boshlashingiz mumkin. Taglavhalarni chiqarish Noto‘g‘ri PIN-kod Assistentning boshqa imkoniyatlarini oching. +Moslashtirish Keyingi oyni ko‘rsatish Boshqa klaviatura ulandi Ochiq diff --git a/ash/strings/ash_strings_zh-HK.xtb b/ash/strings/ash_strings_zh-HK.xtb index 2c14c800584d3f..d706fb12c39565 100644 --- a/ash/strings/ash_strings_zh-HK.xtb +++ b/ash/strings/ash_strings_zh-HK.xtb @@ -192,6 +192,7 @@ 桌面 7 當畫面上有受保護的內容時,就無法使用螢幕畫面錄影功能 正在掃描裝置… +下載「」時發生問題 藍牙已停用 登出所有使用者 某個應用程式正在使用麥克風 @@ -587,6 +588,7 @@ 確定要關閉自動點擊功能嗎? 突顯鍵盤焦點所在的物件 不執行任何操作 (暫停) +請檢查網路連線以下載「 系統稍後將再次嘗試下載,語音會暫時傳送給 Google 處理,直至下載完成。 已啟用 Alt + 搜尋鍵或 Shift 鍵 @@ -803,6 +805,7 @@ 拒絕 語言已變更 正在擴充 螢幕 +無法下載檔案 全螢幕放大鏡 USB-C 裝置 (右側連接埠) 要求您在期限前更新 @@ -814,7 +817,9 @@ 請勿騷擾 Emoji 訊號強度係 ,手機電量係 +正在掃描下載項目「 正在投放至 +新安裝的「 詢問管理員 無法連接 eSIM {0,plural, =1{請在 1 小時內更新裝置}other{請在 # 小時內更新裝置}} @@ -846,6 +851,7 @@ 電源 已連接,電量為 % + +前往「設定」 由管理員強制執行 效能追蹤已啟用 已移除桌面 ,並與桌面 合併 @@ -981,6 +987,7 @@ 輕觸即可設定 VPN 新增流動網絡 +再試一次 {NUM_NOTIFICATIONS,plural, =1{1 則通知}other{# 則通知}} 剪下 在捷徑列中顯示應用程式 @@ -1167,6 +1174,7 @@ HSPA 正在使用 身份解鎖裝置即可執行有關通知的動作 +管理儲存空間 請輸入 Family Link 家長存取碼。 全螢幕 打開設定 @@ -1212,6 +1220,7 @@ 我日曆有咩活動? 提供意見反映 拒絕 +可用空間不足,無法下載「」。請釋出空間。 顯示緊 個同「」有關嘅結果 橫向 視窗 閂咗。 diff --git a/ash/strings/ash_strings_zh-TW.xtb b/ash/strings/ash_strings_zh-TW.xtb index 78deee9b55c1ac..b2d6ff1231c427 100644 --- a/ash/strings/ash_strings_zh-TW.xtb +++ b/ash/strings/ash_strings_zh-TW.xtb @@ -192,6 +192,7 @@ 桌面 7 當畫面上有受保護的內容時,無法使用螢幕畫面錄製功能 正在掃描裝置... +下載「」時發生問題 藍牙已停用 登出所有使用者 某個應用程式正在使用麥克風 @@ -587,6 +588,7 @@ 確定要關閉自動點擊功能嗎? 醒目顯示鍵盤焦點所在物件 不執行任何動作 (暫停) +請檢查網路連線以下載「 系統稍後將再次嘗試下載。在下載作業完成前,系統會先將語音內容傳送給 Google 處理。 已啟用 Alt + 搜尋鍵或 Shift 鍵 @@ -804,6 +806,7 @@ 拒絕 語言已變更 正在擴充 畫面 +無法下載檔案 全螢幕放大鏡 USB-C 裝置 (右側連接埠) 要求你在期限內更新 @@ -815,7 +818,9 @@ 請勿打擾 表情符號 訊號強度 ,手機電量: +正在掃描下載項目「 正在投放至 +新安裝的「 詢問系統管理員 無法建立 eSIM 卡連線 {0,plural, =1{請在 1 小時內更新裝置}other{請在 # 小時內更新裝置}} @@ -847,6 +852,7 @@ 電源 已連線,電量為 % + +前往「設定」 由系統管理員強制執行 效能追蹤已啟用 已移除桌面 ,並與桌面 合併 @@ -982,6 +988,7 @@ 輕觸即可進行設定 VPN 新增行動網路 +再試一次 {NUM_NOTIFICATIONS,plural, =1{1 則通知}other{# 則通知}} 剪下 顯示檔案櫃中的應用程式 @@ -1168,6 +1175,7 @@ HSPA 目前使用 帳戶解鎖裝置,即可執行通知動作 +管理儲存空間 請輸入 Family Link 家長存取碼。 全螢幕 開啟「」設定 @@ -1213,6 +1221,7 @@ 我的日曆上有什麼活動? 提供意見 拒絕 +可用空間不足,無法下載「」。請釋出空間。 目前正顯示 項與「」相符的搜尋結果 橫向 視窗 已關閉。 diff --git a/base/android/jni_generator/jni_registration_generator.py b/base/android/jni_generator/jni_registration_generator.py index a21b89bf2d3086..528eada6dbe51f 100755 --- a/base/android/jni_generator/jni_registration_generator.py +++ b/base/android/jni_generator/jni_registration_generator.py @@ -57,15 +57,13 @@ def _Generate(java_file_paths, """ # Without multiprocessing, script takes ~13 seconds for chrome_public_apk # on a z620. With multiprocessing, takes ~2 seconds. - pool = multiprocessing.Pool() - results = [] - for d in pool.imap_unordered( - functools.partial(_DictForPath, use_proxy_hash=proxy_opts.use_hash), - java_file_paths): - if d: - results.append(d) - pool.close() + with multiprocessing.Pool() as pool: + for d in pool.imap_unordered( + functools.partial(_DictForPath, use_proxy_hash=proxy_opts.use_hash), + java_file_paths): + if d: + results.append(d) # Sort to make output deterministic. results.sort(key=lambda d: d['FULL_CLASS_NAME']) diff --git a/base/synchronization/waitable_event_watcher_posix.cc b/base/synchronization/waitable_event_watcher_posix.cc index e1fe8b3871bd84..ec76363c7ba0d1 100644 --- a/base/synchronization/waitable_event_watcher_posix.cc +++ b/base/synchronization/waitable_event_watcher_posix.cc @@ -184,7 +184,7 @@ void WaitableEventWatcher::StopWatching() { // In this case, a task was enqueued on the MessageLoop and will run. // We set the flag in case the task hasn't yet run. The flag will stop the // delegate getting called. If the task has run then we have the last - // reference to the flag and it will be deleted immedately after. + // reference to the flag and it will be deleted immediately after. cancel_flag_->Set(); cancel_flag_ = nullptr; return; diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 39e670f692d236..04f7e11cc49da1 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1 @@ -1 +1 @@ -7.20211213.3.1 +7.20211214.1.1 diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index bf543a05ff4c40..04f7e11cc49da1 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1 @@ -1 +1 @@ -7.20211213.3.2 +7.20211214.1.1 diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 39e670f692d236..04f7e11cc49da1 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1 @@ -1 +1 @@ -7.20211213.3.1 +7.20211214.1.1 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 890f31ef326fca..b6048faf44a74a 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -1422,7 +1422,6 @@ android_library("chrome_test_java") { "//chrome/browser/uid/android:java", "//chrome/browser/uid/android:javatests", "//chrome/browser/util:java", - "//chrome/browser/version:java", "//chrome/browser/video_tutorials:test_support_java", "//chrome/browser/webapps/android:java", "//chrome/test:sync_integration_test_support_java", @@ -1541,6 +1540,7 @@ android_library("chrome_test_java") { "//components/url_formatter/android:url_formatter_java", "//components/url_formatter/android:url_formatter_javatests", "//components/user_prefs/android:java", + "//components/version_info/android:version_constants_java", "//components/webapk/android/libs/client:java", "//components/webapps/browser/android:java", "//components/webauthn/android:java", @@ -2468,7 +2468,7 @@ android_library("monochrome_java") { "//android_webview:android_webview_java", "//base:base_java", "//chrome/android:chrome_java", - "//chrome/browser/version:java", + "//components/version_info/android:version_constants_java", "//content/public/android:content_java", ] sources = @@ -2484,7 +2484,7 @@ android_library("base_monochrome_module_java") { ":base_module_java", "//android_webview:android_webview_no_weblayer_java", "//base:base_java", - "//chrome/browser/version:java", + "//components/version_info/android:version_constants_java", "//components/version_info/android:version_constants_java", "//content/public/android:content_java", ] diff --git a/chrome/android/DEPS b/chrome/android/DEPS index b794225d94b50f..2a2b880f203bdb 100644 --- a/chrome/android/DEPS +++ b/chrome/android/DEPS @@ -39,8 +39,8 @@ include_rules = [ "+components/installedapp/android", "+components/invalidation", "+components/javascript_dialogs/android", - "+components/messages/android", "+components/media_router/browser/android", + "+components/messages/android", "+components/page_info/android/java", "+components/permissions/android/nfc", "+components/policy", @@ -54,6 +54,7 @@ include_rules = [ "+components/subresource_filter/android", "+components/translate/content/android", "+components/user_prefs/android", + "+components/version_info/android", "+components/viz/common/java", "+components/webapk/android", "+components/webapps/browser/android/java", diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn index a928f6e50adcee..47ad37d7c73bcf 100644 --- a/chrome/android/features/autofill_assistant/BUILD.gn +++ b/chrome/android/features/autofill_assistant/BUILD.gn @@ -24,7 +24,6 @@ android_library("java") { "//chrome/browser/ui/android/omnibox:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", - "//chrome/browser/version:java", "//components/autofill/android:autofill_java", "//components/autofill_assistant/android:java_resources", "//components/browser_ui/bottomsheet/android:java", @@ -39,6 +38,7 @@ android_library("java") { "//components/policy/android:policy_java", "//components/signin/public/android:java", "//components/url_formatter/android:url_formatter_java", + "//components/version_info/android:version_constants_java", "//content/public/android:content_java", "//mojo/public/java:bindings_java", "//third_party/android_deps:android_support_v7_appcompat_java", diff --git a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java index de8d419fb4f353..eaab934aaffb22 100644 --- a/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java +++ b/chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java @@ -23,9 +23,9 @@ import org.chromium.chrome.browser.autofill_assistant.user_data.additional_sections.AssistantAdditionalSectionContainer; import org.chromium.chrome.browser.payments.ContactEditor; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.payments.BasicCardUtils; import org.chromium.components.payments.MethodStrings; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.content_public.browser.WebContents; import org.chromium.payments.mojom.PaymentMethodData; @@ -691,7 +691,7 @@ private boolean updateEditors( EditorDialog cardEditorDialog = new EditorDialog(view.mActivity, /*deleteRunnable =*/null, profile); - if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) { + if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) { cardEditorDialog.disableScreenshots(); } cardEditor.setEditorDialog(cardEditorDialog); diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java index ed72166f715675..4982fd11309be4 100644 --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java @@ -6,11 +6,13 @@ import android.app.Activity; import android.content.Intent; +import android.os.Build; import androidx.annotation.Nullable; import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler.ExternalAppId; +import org.chromium.chrome.browser.flags.ActivityType; /** * Chrome specific dependency methods used by the Autofill Assistant outside of it's module. @@ -36,5 +38,16 @@ public static boolean isGsa(@Nullable Activity activity) { return IntentHandler.determineExternalIntentSource(intent) == ExternalAppId.GSA; } + /** + * Checks whether direct actions provided by Autofill Assistant should be available - assuming + * that direct actions are available at all. + */ + public static boolean areDirectActionsAvailable(@ActivityType int activityType) { + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q + && (activityType == ActivityType.CUSTOM_TAB || activityType == ActivityType.TABBED) + && AssistantFeatures.AUTOFILL_ASSISTANT.isEnabled() + && AssistantFeatures.AUTOFILL_ASSISTANT_DIRECT_ACTIONS.isEnabled(); + } + private AssistantDependencyUtilsChrome() {} } diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFacade.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFacade.java index d6888c4f5f4744..63223930c9b956 100644 --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFacade.java +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantFacade.java @@ -8,7 +8,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.View; @@ -23,7 +22,6 @@ import org.chromium.chrome.browser.autofill_assistant.metrics.DropOutReason; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.directactions.DirectActionHandler; -import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; @@ -112,22 +110,12 @@ public static void start(@Nullable Activity activity, TriggerContext triggerCont tab -> { AutofillAssistantTabHelper.get(tab).start(triggerContext); }); } - /** - * Checks whether direct actions provided by Autofill Assistant should be available - assuming - * that direct actions are available at all. - */ - public static boolean areDirectActionsAvailable(@ActivityType int activityType) { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q - && (activityType == ActivityType.CUSTOM_TAB || activityType == ActivityType.TABBED) - && AssistantFeatures.AUTOFILL_ASSISTANT.isEnabled() - && AssistantFeatures.AUTOFILL_ASSISTANT_DIRECT_ACTIONS.isEnabled(); - } - /** * Returns a {@link DirectActionHandler} for making dynamic actions available under Android Q. * - *

This should only be called if {@link #areDirectActionsAvailable} returns true. This method - * can also return null if autofill assistant is not available for some other reasons. + *

This should only be called if {@link + * AssistantDependencyUtilsChrome#areDirectActionsAvailable} returns true. This method can also + * return null if autofill assistant is not available for some other reasons. */ public static DirectActionHandler createDirectActionHandler(Context context, BottomSheetController bottomSheetController, diff --git a/chrome/android/features/start_surface/internal/BUILD.gn b/chrome/android/features/start_surface/internal/BUILD.gn index 67549829ea8609..d7b9648a669a99 100644 --- a/chrome/android/features/start_surface/internal/BUILD.gn +++ b/chrome/android/features/start_surface/internal/BUILD.gn @@ -83,13 +83,13 @@ android_library("java") { "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", - "//chrome/browser/version:java", "//chrome/browser/xsurface:java", "//components/browser_ui/bottomsheet/android:java", "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", "//components/prefs/android:java", "//components/user_prefs/android:java", + "//components/version_info/android:version_constants_java", "//content/public/android:content_java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:material_design_java", diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java index 89b0896df677a4..e1b4bb70ab6fdd 100644 --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java @@ -46,8 +46,8 @@ import org.chromium.chrome.browser.tasks.tab_management.TabSwitcher.TabListDelegate; import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.chrome.browser.util.ChromeAccessibilityUtil; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.widget.animation.Interpolators; +import org.chromium.components.version_info.VersionInfo; import org.chromium.ui.resources.ResourceManager; import java.util.ArrayList; @@ -659,7 +659,7 @@ private void reportAnimationPerf(boolean isShrinking) { elapsedMs, mMaxFrameInterval, dirtySpan); // TODO(crbug.com/964406): stop logging it after this feature stabilizes. - if (!ChromeVersionInfo.isStableBuild()) { + if (!VersionInfo.isStableBuild()) { Log.i(TAG, message); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java index 034622c2227ce8..93836db710ab43 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java @@ -18,11 +18,11 @@ import org.chromium.base.library_loader.LibraryLoader; import org.chromium.build.BuildConfig; import org.chromium.chrome.browser.flags.ChromeSwitches; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.strictmode.KnownViolations; import org.chromium.components.strictmode.StrictModePolicyViolation; import org.chromium.components.strictmode.ThreadStrictModeInterceptor; import org.chromium.components.strictmode.Violation; +import org.chromium.components.version_info.VersionInfo; import java.io.PrintWriter; import java.io.StringWriter; @@ -160,8 +160,7 @@ public static void configureStrictMode() { if (!ChromeStrictModeSwitch.ALLOW_STRICT_MODE_CHECKING) return; CommandLine commandLine = CommandLine.getInstance(); - boolean shouldApplyPenalties = BuildConfig.ENABLE_ASSERTS - || ChromeVersionInfo.isLocalBuild() + boolean shouldApplyPenalties = BuildConfig.ENABLE_ASSERTS || VersionInfo.isLocalBuild() || commandLine.hasSwitch(ChromeSwitches.STRICT_MODE); // Enroll 1% of dev sessions into StrictMode watch. This is done client-side rather than @@ -169,9 +168,8 @@ public static void configureStrictMode() { // process. We need to detect early start-up StrictMode violations before loading native and // before warming the SharedPreferences (that is a violation in an of itself). We will // closely monitor this on dev channel. - boolean enableStrictModeWatch = - (ChromeVersionInfo.isLocalBuild() && !BuildConfig.ENABLE_ASSERTS) - || (ChromeVersionInfo.isDevBuild() && Math.random() < UPLOAD_PROBABILITY); + boolean enableStrictModeWatch = (VersionInfo.isLocalBuild() && !BuildConfig.ENABLE_ASSERTS) + || (VersionInfo.isDevBuild() && Math.random() < UPLOAD_PROBABILITY); if (!shouldApplyPenalties && !enableStrictModeWatch) return; StrictMode.ThreadPolicy.Builder threadPolicy = diff --git a/chrome/android/java/src/org/chromium/chrome/browser/MonochromeApplicationImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/MonochromeApplicationImpl.java index 39ef59cf325009..4766871733df0f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/MonochromeApplicationImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/MonochromeApplicationImpl.java @@ -8,7 +8,7 @@ import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.chrome.browser.base.SplitCompatApplication; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; /** * This is Application class for Monochrome. @@ -28,7 +28,7 @@ public MonochromeApplicationImpl() {} @Override public void onCreate() { super.onCreate(); - if (!ChromeVersionInfo.isStableBuild()) { + if (!VersionInfo.isStableBuild()) { // Performing Monochrome WebView DevTools Launcher icon showing/hiding logic in // onCreate rather than in attachBaseContext() because it depends on application // context being initiatied. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java index e984d4fe04e57d..c552741f32fc65 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java @@ -15,8 +15,8 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.tracing.settings.DeveloperSettings; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.settings.SettingsUtils; +import org.chromium.components.version_info.VersionInfo; import org.chromium.ui.widget.Toast; import java.util.Calendar; @@ -66,7 +66,7 @@ public void onCreatePreferences(Bundle bundle, String s) { * versions are more useful. */ public static String getApplicationVersion(Context context, String version) { - if (ChromeVersionInfo.isOfficialBuild()) { + if (VersionInfo.isOfficialBuild()) { return version; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java index 5b26ebe9abc561..30ffb14ffe59fa 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java @@ -27,7 +27,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; import org.chromium.chrome.browser.payments.SettingsAutofillAndPaymentsObserver; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -58,7 +58,7 @@ public AutofillLocalCardEditor() {} public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Allow screenshots of the credit card number in Canary, Dev, and developer builds. - if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) { + if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) { WindowManager.LayoutParams attributes = getActivity().getWindow().getAttributes(); attributes.flags |= WindowManager.LayoutParams.FLAG_SECURE; getActivity().getWindow().setAttributes(attributes); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/base/DexFixer.java b/chrome/android/java/src/org/chromium/chrome/browser/base/DexFixer.java index d3821be78ff776..46138ea8bfb6a3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/base/DexFixer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/base/DexFixer.java @@ -28,7 +28,7 @@ import org.chromium.chrome.browser.DeferredStartupHandler; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import java.io.File; import java.io.IOException; @@ -106,7 +106,7 @@ private static boolean shouldSkipDexFix() { } // Skip the workaround on local builds to avoid affecting perf bots. // https://bugs.chromium.org/p/chromium/issues/detail?id=1160070 - if (ChromeVersionInfo.isLocalBuild() && ChromeVersionInfo.isOfficialBuild()) { + if (VersionInfo.isLocalBuild() && VersionInfo.isOfficialBuild()) { return true; } return false; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java index a34f0e466d2004..df2e59dda44263 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/base/SplitMonochromeApplication.java @@ -8,7 +8,7 @@ import org.chromium.android_webview.nonembedded.WebViewApkApplication; import org.chromium.base.library_loader.LibraryProcessType; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.ChildProcessCreationParams; /** @@ -22,7 +22,7 @@ public void onCreate() { super.onCreate(); // TODO(crbug.com/1126301): This matches logic in MonochromeApplication.java. // Deduplicate if chrome split launches. - if (!ChromeVersionInfo.isStableBuild() && getApplication().isWebViewProcess()) { + if (!VersionInfo.isStableBuild() && getApplication().isWebViewProcess()) { WebViewApkApplication.postDeveloperUiLauncherIconTask(); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java index dd882a1dc8d7c7..98c41dc3177f1b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClientAppBroadcastReceiver.java @@ -13,8 +13,8 @@ import org.chromium.chrome.browser.browserservices.metrics.BrowserServicesTimingMetrics; import org.chromium.chrome.browser.browserservices.permissiondelegation.PermissionUpdater; import org.chromium.chrome.browser.metrics.WebApkUninstallUmaTracker; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.embedder_support.util.Origin; +import org.chromium.components.version_info.VersionInfo; import org.chromium.components.webapk.lib.common.WebApkConstants; import java.util.Arrays; @@ -97,7 +97,7 @@ public void onReceive(Context context, Intent intent) { // Since we only care about ACTION_PACKAGE_DATA_CLEARED and and ACTION_PACKAGE_FULLY_REMOVED // which are protected Intents, we can assume that anything that gets past here will be a // legitimate Intent sent by the system. - boolean debug = ChromeVersionInfo.isLocalBuild() && ACTION_DEBUG.equals(intent.getAction()); + boolean debug = VersionInfo.isLocalBuild() && ACTION_DEBUG.equals(intent.getAction()); if (!debug && !BROADCASTS.contains(intent.getAction())) return; int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java index c53f4274bbbaa8..9d90e96a787149 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java @@ -24,12 +24,12 @@ import org.chromium.chrome.browser.incognito.IncognitoUtils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid; import org.chromium.components.embedder_support.view.ContentView; import org.chromium.components.external_intents.ExternalNavigationHandler; import org.chromium.components.navigation_interception.InterceptNavigationDelegate; import org.chromium.components.navigation_interception.NavigationParams; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadCommittedDetails; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationHandle; @@ -348,7 +348,7 @@ private void createNewWebContents() { } OverlayViewDelegate delegate = new OverlayViewDelegate(cv); - mWebContents.initialize(ChromeVersionInfo.getProductVersion(), delegate, cv, mWindowAndroid, + mWebContents.initialize(VersionInfo.getProductVersion(), delegate, cv, mWindowAndroid, WebContents.createDefaultInternalsHolder()); ContentUtils.setUserAgentOverride(mWebContents, /* overrideInNewTabs= */ false); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelCoordinator.java index e0752f76887199..08fd23d3c3a11a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelCoordinator.java @@ -19,7 +19,6 @@ import org.chromium.chrome.browser.content.ContentUtils; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.SheetState; import org.chromium.components.browser_ui.bottomsheet.BottomSheetObserver; @@ -28,6 +27,7 @@ import org.chromium.components.thinwebview.ThinWebView; import org.chromium.components.thinwebview.ThinWebViewConstraints; import org.chromium.components.thinwebview.ThinWebViewFactory; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.IntentRequestTracker; @@ -92,7 +92,7 @@ private void createWebContents() { mWebContentView = ContentView.createContentView(mContext, null, mWebContents); final ViewAndroidDelegate delegate = ViewAndroidDelegate.createBasicDelegate(mWebContentView); - mWebContents.initialize(ChromeVersionInfo.getProductVersion(), delegate, mWebContentView, + mWebContents.initialize(VersionInfo.getProductVersion(), delegate, mWebContentView, mWindowAndroid, WebContents.createDefaultInternalsHolder()); ContentUtils.setUserAgentOverride(mWebContents, /* overrideInNewTabs= */ false); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java index d1b5f76234c2f7..4b8c69a2d2461f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java @@ -28,7 +28,6 @@ import org.chromium.chrome.browser.tabmodel.TabCreator; import org.chromium.chrome.browser.ui.favicon.FaviconHelper; import org.chromium.chrome.browser.ui.favicon.FaviconUtils; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController.SheetState; @@ -38,6 +37,7 @@ import org.chromium.components.embedder_support.view.ContentView; import org.chromium.components.feature_engagement.EventConstants; import org.chromium.components.feature_engagement.Tracker; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.UiUtils; @@ -203,7 +203,7 @@ private void createWebContents(Profile profile) { mContentView = ContentView.createContentView( mContext, null /* eventOffsetHandler */, mWebContents); - mWebContents.initialize(ChromeVersionInfo.getProductVersion(), + mWebContents.initialize(VersionInfo.getProductVersion(), ViewAndroidDelegate.createBasicDelegate(mContentView), mContentView, mWindow, WebContents.createDefaultInternalsHolder()); ContentUtils.setUserAgentOverride(mWebContents, /* overrideInNewTabs= */ false); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java index 34484fc6c8fd34..b115a0d838d957 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java @@ -31,11 +31,11 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.embedder_support.util.UrlUtilities; import org.chromium.components.prefs.PrefService; import org.chromium.components.user_prefs.UserPrefs; +import org.chromium.components.version_info.VersionInfo; import org.chromium.url.GURL; import java.util.regex.Pattern; @@ -308,7 +308,7 @@ boolean isLiteralSearchTapEnabled() { */ boolean shouldShowErrorCodeInBar() { // Builds with lots of real users should not see raw error codes. - return !(ChromeVersionInfo.isStableBuild() || ChromeVersionInfo.isBetaBuild()); + return !(VersionInfo.isStableBuild() || VersionInfo.isBetaBuild()); } /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java index c9c3e0c44ed8b7..31ed1551f42546 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java @@ -23,8 +23,8 @@ import org.chromium.base.annotations.UsedByReflection; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.crash.CrashKeys; +import org.chromium.components.version_info.VersionInfo; import java.io.File; import java.io.FileNotFoundException; @@ -158,7 +158,7 @@ private void createReport(Throwable javaException) { addPairedString(PRODUCT, "Chrome_Android"); addPairedString(PROCESS_TYPE, processName); addPairedString(DEVICE, Build.DEVICE); - addPairedString(VERSION, ChromeVersionInfo.getProductVersion()); + addPairedString(VERSION, VersionInfo.getProductVersion()); addPairedString(CHANNEL, getChannel()); addPairedString(ANDROID_BUILD_ID, Build.ID); addPairedString(MODEL, Build.MODEL); @@ -200,13 +200,13 @@ private void flushToFile() { } private static String getChannel() { - if (ChromeVersionInfo.isCanaryBuild()) { + if (VersionInfo.isCanaryBuild()) { return "canary"; } - if (ChromeVersionInfo.isDevBuild()) { + if (VersionInfo.isDevBuild()) { return "dev"; } - if (ChromeVersionInfo.isBetaBuild()) { + if (VersionInfo.isBetaBuild()) { return "beta"; } // An empty string indicates the stable channel. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java index 5905a3de79ff1b..f9a4617a9aee06 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java @@ -44,9 +44,9 @@ import org.chromium.chrome.browser.flags.ActivityType; import org.chromium.chrome.browser.flags.CachedFeatureFlags; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.widget.TintedDrawable; import org.chromium.components.embedder_support.util.UrlConstants; +import org.chromium.components.version_info.VersionInfo; import org.chromium.device.mojom.ScreenOrientationLockType; import java.lang.annotation.Retention; @@ -402,7 +402,7 @@ private boolean checkCloseButtonSize(Context context, Bitmap bitmap) { */ private int verifiedUiType(int requestedUiType) { if (!isTrustedIntent()) { - if (ChromeVersionInfo.isLocalBuild()) Log.w(TAG, FIRST_PARTY_PITFALL_MSG); + if (VersionInfo.isLocalBuild()) Log.w(TAG, FIRST_PARTY_PITFALL_MSG); return CustomTabsUiType.DEFAULT; } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/directactions/DirectActionInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/directactions/DirectActionInitializer.java index 527ad7f8b78a43..a25c7c4f48299e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/directactions/DirectActionInitializer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/directactions/DirectActionInitializer.java @@ -14,6 +14,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.AppHooks; +import org.chromium.chrome.browser.autofill_assistant.AssistantDependencyUtilsChrome; import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantFacade; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.compositor.CompositorViewHolder; @@ -152,7 +153,7 @@ private void registerCommonChromeActions(Context context, @ActivityType int acti registerMenuHandlerIfNecessary(actionController, tabModelSelector) .allowlistActions(R.id.forward_menu_id, R.id.reload_menu_id); - if (AutofillAssistantFacade.areDirectActionsAvailable(activityType)) { + if (AssistantDependencyUtilsChrome.areDirectActionsAvailable(activityType)) { DirectActionHandler handler = AutofillAssistantFacade.createDirectActionHandler(context, bottomSheetController, browserControls, compositorViewHolder, activityTabProvider); @@ -207,7 +208,7 @@ public void onFinishNativeInitialization() { void registerDirectActions() { registerCommonChromeActions(mContext, mActivityType, mMenuOrKeyboardActionController, mGoBackAction, mTabModelSelector, mFindToolbarManager, - AutofillAssistantFacade.areDirectActionsAvailable(mActivityType) + AssistantDependencyUtilsChrome.areDirectActionsAvailable(mActivityType) ? mBottomSheetController : null, mBrowserControls, mCompositorViewHolder, mActivityTabProvider); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java index 042f7dc3124cba..3650798158c68e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java @@ -27,8 +27,8 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial; import org.chromium.chrome.browser.ui.signin.fre.FreUMADialogCoordinator; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.signin.ChildAccountStatus; +import org.chromium.components.version_info.VersionInfo; import org.chromium.ui.modaldialog.ModalDialogManagerHolder; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; @@ -97,8 +97,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) { ((compoundButton, isChecked) -> mAllowCrashUpload = isChecked)); if (!canShowUmaCheckBox()) { if (!FREMobileIdentityConsistencyFieldTrial.shouldShowOldFreWithUmaDialog()) { - mAllowCrashUpload = - sShowUmaCheckBoxForTesting || ChromeVersionInfo.isOfficialBuild(); + mAllowCrashUpload = sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild(); } mSendReportCheckBox.setVisibility(View.GONE); } @@ -307,7 +306,7 @@ protected View getToSAndPrivacyText() { */ protected boolean canShowUmaCheckBox() { return !FREMobileIdentityConsistencyFieldTrial.shouldShowOldFreWithUmaDialog() - && (sShowUmaCheckBoxForTesting || ChromeVersionInfo.isOfficialBuild()); + && (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild()); } @VisibleForTesting diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java index 502b72f2908ba1..b9507303ab038a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java @@ -27,7 +27,7 @@ import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.customtabs.CustomTabsConnection; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; /** * An exposed Activity that allows launching an Incognito Tab. @@ -60,7 +60,7 @@ public class IncognitoTabLauncher extends Activity { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (ChromeVersionInfo.isLocalBuild() && ACTION_DEBUG.equals(getIntent().getAction())) { + if (VersionInfo.isLocalBuild() && ACTION_DEBUG.equals(getIntent().getAction())) { setComponentEnabled(false); finish(); return; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java index fe18f3f8daa098..031852f42ea452 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java @@ -16,8 +16,8 @@ import org.chromium.base.task.TaskTraits; import org.chromium.chrome.browser.ChromeActivitySessionTracker; import org.chromium.chrome.browser.flags.CachedFeatureFlags; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.variations.firstrun.VariationsSeedFetcher; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.ChildProcessLauncherHelper; import org.chromium.content_public.browser.UiThreadTaskTraits; @@ -40,7 +40,7 @@ public abstract class AsyncInitTaskRunner { @VisibleForTesting boolean shouldFetchVariationsSeedDuringFirstRun() { - return ChromeVersionInfo.isOfficialBuild(); + return VersionInfo.isOfficialBuild(); } @VisibleForTesting @@ -55,7 +55,7 @@ private class FetchSeedTask implements Runnable { public FetchSeedTask(String restrictMode) { mRestrictMode = restrictMode; - mMilestone = Integer.toString(ChromeVersionInfo.getProductMajorVersion()); + mMilestone = Integer.toString(VersionInfo.getProductMajorVersion()); mChannel = getChannelString(); } @@ -71,16 +71,16 @@ public void run() { } private String getChannelString() { - if (ChromeVersionInfo.isCanaryBuild()) { + if (VersionInfo.isCanaryBuild()) { return "canary"; } - if (ChromeVersionInfo.isDevBuild()) { + if (VersionInfo.isDevBuild()) { return "dev"; } - if (ChromeVersionInfo.isBetaBuild()) { + if (VersionInfo.isBetaBuild()) { return "beta"; } - if (ChromeVersionInfo.isStableBuild()) { + if (VersionInfo.isStableBuild()) { return "stable"; } return ""; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java index 73d9a1244d931c..aee4f8c7029f89 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java @@ -18,8 +18,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector; import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.variations.VariationsAssociatedData; +import org.chromium.components.version_info.VersionInfo; /** * Class that detects if the network is offline. Waits for the network to stablize before notifying @@ -100,8 +100,8 @@ class OfflineDetector private long mTimeWhenLastOnline; // Set to true if adb console logging should be enabled. - private static final boolean sLoggingEnabled = ChromeVersionInfo.isCanaryBuild() - || ChromeVersionInfo.isDevBuild() || ChromeVersionInfo.isLocalBuild(); + private static final boolean sLoggingEnabled = + VersionInfo.isCanaryBuild() || VersionInfo.isDevBuild() || VersionInfo.isLocalBuild(); private static final String TAG = "OfflineDetector"; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java index 9f616f24b0f02d..cfbdecb8799ea9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java @@ -17,7 +17,7 @@ import org.chromium.base.Log; import org.chromium.base.StreamUtil; import org.chromium.base.ThreadUtils; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -547,7 +547,7 @@ private ExponentialBackoffScheduler getBackoffScheduler() { /** Begin communicating with the Omaha Update Server. */ public static void onForegroundSessionStart(Context context) { - if (!ChromeVersionInfo.isOfficialBuild() || isDisabled()) return; + if (!VersionInfo.isOfficialBuild() || isDisabled()) return; OmahaService.startServiceImmediately(context); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java b/chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java index 375443c61ef194..04b1200affd0a6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java @@ -8,7 +8,7 @@ import android.content.pm.ApplicationInfo; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; /** * The Java counterpart for the C++ partner bookmarks shim. @@ -36,7 +36,7 @@ public static void kickOffReading(Context context) { boolean systemOrPreStable = (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1 - || !ChromeVersionInfo.isStableBuild(); + || !VersionInfo.isStableBuild(); if (!systemOrPreStable) { reader.onBookmarksRead(); return; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java index 8b4f7e9469fbd3..133a26967dd8fb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java @@ -24,9 +24,9 @@ import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.components.embedder_support.util.UrlUtilities; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.UiThreadTaskTraits; import java.util.ArrayList; @@ -118,7 +118,7 @@ private boolean isValidInternal() { if (sIgnoreSystemPackageCheck != null && !sIgnoreSystemPackageCheck) { return false; } - if (ChromeVersionInfo.isLocalBuild()) { + if (VersionInfo.isLocalBuild()) { Log.w(TAG, "This is a local build of Chrome Android, " + "so keep reading the browser content provider, " @@ -331,7 +331,7 @@ protected Void doInBackground() { try { boolean systemOrPreStable = (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1 - || !ChromeVersionInfo.isStableBuild(); + || !VersionInfo.isStableBuild(); if (!systemOrPreStable) { // Only allow partner customization if this browser is a system package, or // is in pre-stable channels. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java index 0f64776bb2500a..17dca9aed77ae6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java @@ -16,7 +16,6 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorSupplier; import org.chromium.chrome.browser.ui.TabObscuringHandler; import org.chromium.chrome.browser.ui.TabObscuringHandlerSupplier; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerProvider; import org.chromium.components.embedder_support.view.ContentView; @@ -24,6 +23,7 @@ import org.chromium.components.thinwebview.ThinWebView; import org.chromium.components.thinwebview.ThinWebViewConstraints; import org.chromium.components.thinwebview.ThinWebViewFactory; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.SelectionClient; import org.chromium.content_public.browser.SelectionPopupController; @@ -139,7 +139,7 @@ public WebContents show(WebContents paymentRequestWebContents, GURL url, boolean private void initializeWebContents( WindowAndroid windowAndroid, ContentView webContentView, GURL url) { - mPaymentHandlerWebContents.initialize(ChromeVersionInfo.getProductVersion(), + mPaymentHandlerWebContents.initialize(VersionInfo.getProductVersion(), ViewAndroidDelegate.createBasicDelegate(webContentView), webContentView, windowAndroid, WebContents.createDefaultInternalsHolder()); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java index eec8a9f0c0f73d..0eee9c37935820 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java @@ -47,7 +47,6 @@ import org.chromium.chrome.browser.payments.ui.PaymentUiService.PaymentUisShowStateReconciler; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.signin.services.IdentityServicesProvider; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.autofill.EditableOption; import org.chromium.components.browser_ui.widget.FadingEdgeScrollView; import org.chromium.components.browser_ui.widget.animation.FocusAnimator; @@ -58,6 +57,7 @@ import org.chromium.components.signin.base.CoreAccountInfo; import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.signin.identitymanager.IdentityManager; +import org.chromium.components.version_info.VersionInfo; import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; import org.chromium.ui.text.SpanApplier.SpanInfo; @@ -422,7 +422,7 @@ public void onResult(PaymentInformation result) { DimmingDialog.setVisibleStatusBarIconColor(mCardEditorDialog.getWindow()); // Allow screenshots of the credit card number in Canary, Dev, and developer builds. - if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) { + if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) { mCardEditorDialog.disableScreenshots(); } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java index 2dbddbe5e8b9e4..bf88c7607e3c7c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java @@ -11,9 +11,9 @@ import android.os.Messenger; import org.chromium.base.ContextUtils; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.externalauth.ExternalAuthUtils; import org.chromium.components.externalauth.VerifiedHandler; +import org.chromium.components.version_info.VersionInfo; /** * A bound service that does nothing. Kept here to prevent old clients relying on it being @@ -26,9 +26,8 @@ public class ChromePrerenderServiceImpl extends ChromePrerenderService.Impl { static class IncomingHandler extends VerifiedHandler { IncomingHandler(Context context) { super(context, ExternalAuthUtils.getInstance(), - ChromeVersionInfo.isLocalBuild() - ? 0 - : ExternalAuthUtils.FLAG_SHOULD_BE_GOOGLE_SIGNED); + VersionInfo.isLocalBuild() ? 0 + : ExternalAuthUtils.FLAG_SHOULD_BE_GOOGLE_SIGNED); } @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java index 69f2ba955ca4e9..a78a720298bb4a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java @@ -38,7 +38,6 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.browser_ui.site_settings.AllSiteSettings; import org.chromium.components.browser_ui.site_settings.SingleCategorySettings; @@ -47,6 +46,7 @@ import org.chromium.components.browser_ui.site_settings.Website.StoredDataClearedCallback; import org.chromium.components.browser_ui.site_settings.WebsitePermissionsFetcher; import org.chromium.components.browser_ui.util.ConversionUtils; +import org.chromium.components.version_info.VersionInfo; import java.util.Collection; @@ -122,8 +122,8 @@ public void onStartupFailure(Exception failureCause) { } }; - String productVersion = AboutChromeSettings.getApplicationVersion( - this, ChromeVersionInfo.getProductVersion()); + String productVersion = + AboutChromeSettings.getApplicationVersion(this, VersionInfo.getProductVersion()); String failedVersion = SharedPreferencesManager.getInstance().readString( ChromePreferenceKeys.SETTINGS_WEBSITE_FAILED_BUILD_VERSION, null); if (TextUtils.equals(failedVersion, productVersion)) { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS b/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS index 1ecf0430e26dec..05938e2d1c8e12 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS @@ -75,6 +75,7 @@ specific_include_rules = { "+components/url_formatter/android", "+components/navigation_interception/android/java/src/org/chromium/components/navigation_interception", "+components/security_state/content/android/java/src/org/chromium/components/security_state/SecurityStateModel.java", + "+components/version_info/android", ], 'TabStateBrowserControlsVisibilityDelegate\.java': [ "+chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/ChromeAccessibilityUtil.java", diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java index 9d5849176a2f71..1aac96f16f4fea 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java @@ -49,7 +49,6 @@ import org.chromium.chrome.browser.ui.TabObscuringHandler; import org.chromium.chrome.browser.ui.native_page.FrozenNativePage; import org.chromium.chrome.browser.ui.native_page.NativePage; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.chrome.browser.vr.VrModuleProvider; import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils; import org.chromium.components.embedder_support.util.UrlConstants; @@ -57,6 +56,7 @@ import org.chromium.components.security_state.ConnectionSecurityLevel; import org.chromium.components.security_state.SecurityStateModel; import org.chromium.components.url_formatter.UrlFormatter; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.ChildProcessImportance; import org.chromium.content_public.browser.ContentFeatureList; import org.chromium.content_public.browser.LoadUrlParams; @@ -81,7 +81,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer { /** Used for logging. */ private static final String TAG = "Tab"; - private static final String PRODUCT_VERSION = ChromeVersionInfo.getProductVersion(); + private static final String PRODUCT_VERSION = VersionInfo.getProductVersion(); private static final String REQUEST_DESKTOP_ENABLED_PARAM = "enabled"; 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 index 9dd2d18cd6af69..fb9676a8a286f5 100644 --- 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 @@ -100,7 +100,6 @@ import org.chromium.chrome.browser.ui.signin.SigninPromoUtil; import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider; import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.chrome.browser.vr.VrModuleProvider; import org.chromium.chrome.browser.webapps.AddToHomescreenIPHController; import org.chromium.chrome.browser.webapps.AddToHomescreenMostVisitedTileClickObserver; @@ -114,6 +113,7 @@ import org.chromium.components.browser_ui.widget.TouchEventObserver; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; import org.chromium.components.messages.MessageDispatcherProvider; +import org.chromium.components.version_info.VersionInfo; import org.chromium.components.webapps.bottomsheet.PwaBottomSheetController; import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFactory; import org.chromium.content_public.browser.WebContents; @@ -897,8 +897,7 @@ private boolean triggerPromo(boolean intentWithEffect) { private boolean maybeShowPromo() { // Only one promo can be shown in one run to avoid nagging users too much. if (SigninPromoUtil.launchSigninPromoIfNeeded(mActivity, - SyncConsentActivityLauncherImpl.get(), - ChromeVersionInfo.getProductMajorVersion())) { + SyncConsentActivityLauncherImpl.get(), VersionInfo.getProductMajorVersion())) { return true; } if (DataReductionPromoScreen.launchDataReductionPromo( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/JourneyManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/JourneyManager.java index a4b5223bad3e17..8b9786d24c36a5 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/JourneyManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/JourneyManager.java @@ -26,7 +26,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabModelObserver; import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationHandle; import org.chromium.ui.base.PageTransition; @@ -73,8 +73,8 @@ public JourneyManager(TabModelSelector selector, @NonNull ActivityLifecycleDispatcher dispatcher, @NonNull OverviewModeBehavior overviewModeBehavior, EngagementTimeUtil engagementTimeUtil) { - if (!ChromeVersionInfo.isLocalBuild() && !ChromeVersionInfo.isCanaryBuild() - && !ChromeVersionInfo.isDevBuild()) { + if (!VersionInfo.isLocalBuild() && !VersionInfo.isCanaryBuild() + && !VersionInfo.isDevBuild()) { // We do not want this in beta/stable until it's no longer backed by SharedPreferences. mTabModelSelectorTabObserver = null; mTabModelSelectorTabModelObserver = null; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java index 1f9156c7fb11dc..db6ca8da0ebccb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java @@ -12,10 +12,10 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.components.version_info.Channel; import org.chromium.components.version_info.VersionConstants; +import org.chromium.components.version_info.VersionInfo; /** * Settings fragment containing preferences aimed at Chrome and web developers. @@ -53,7 +53,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String s) { getActivity().setTitle(MSG_DEVELOPER_OPTIONS_TITLE); SettingsUtils.addPreferencesFromResource(this, R.xml.developer_preferences); - if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) { + if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) { getPreferenceScreen().removePreference(findPreference(UI_PREF_BETA_STABLE_HINT)); } } diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTest.java index 40d8270bff9bd7..2c0c285bcda69d 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/PowerBookmarkTest.java @@ -27,6 +27,7 @@ import org.chromium.base.Callback; import org.chromium.base.FeatureList; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.chrome.R; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -149,6 +150,7 @@ public void testShoppingNormalPriceWithTrackingDisabled() throws IOException { @Test @MediumTest @Feature({"RenderTest"}) + @DisabledTest(message = "https://crbug.com/1279804") public void testShoppingPriceDrop() throws IOException { TestThreadUtils.runOnUiThreadBlocking(() -> { mPowerBookmarkShoppingItemRow.initPriceTrackingUI("http://foo.com/img", false, diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java index 5ac975cca9e2ef..2ccc5c0894d0bd 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java @@ -20,6 +20,7 @@ import org.chromium.base.test.util.Batch; import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.JniMocker; import org.chromium.base.test.util.Restriction; @@ -305,6 +306,7 @@ public void testLongpressFollowedByNonTextTap() { @Feature({"ContextualSearch"}) @Restriction(Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE) @Features.DisableFeatures(ChromeFeatureList.SNOOZABLE_IPH) + @DisabledTest(message = "https://crbug.com/1279770") public void testTextTapFollowedByNonTextTap() { Assert.assertEquals(mPanelManager.getRequestPanelShowCount(), 0); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java index a5f1fe9bdaa241..a8aae44bc90811 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ScreenShooter.java @@ -25,7 +25,7 @@ import org.junit.runner.Description; import org.chromium.base.test.util.Feature; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import java.io.File; import java.io.FileWriter; @@ -176,20 +176,20 @@ public void shoot(String shotName, TagsEnum... tags) { orientation == Configuration.ORIENTATION_LANDSCAPE ? "landscape" : "portrait"); setFilterValue(filters, ANDROID_VERSION_FILTER, Build.VERSION.RELEASE); setFilterValue(filters, CHROME_VERSION_FILTER, - Integer.toString(ChromeVersionInfo.getProductMajorVersion())); + Integer.toString(VersionInfo.getProductMajorVersion())); String channelName = "Unknown"; - if (ChromeVersionInfo.isLocalBuild()) { + if (VersionInfo.isLocalBuild()) { channelName = "Local Build"; - } else if (ChromeVersionInfo.isCanaryBuild()) { + } else if (VersionInfo.isCanaryBuild()) { channelName = "Canary"; - } else if (ChromeVersionInfo.isBetaBuild()) { + } else if (VersionInfo.isBetaBuild()) { channelName = "Beta"; - } else if (ChromeVersionInfo.isDevBuild()) { + } else if (VersionInfo.isDevBuild()) { channelName = "Dev"; - } else if (ChromeVersionInfo.isStableBuild()) { + } else if (VersionInfo.isStableBuild()) { channelName = "Stable"; } - if (ChromeVersionInfo.isOfficialBuild()) { + if (VersionInfo.isOfficialBuild()) { channelName = channelName + " Official"; } setFilterValue(filters, CHROME_CHANNEL_FILTER, channelName); @@ -199,7 +199,7 @@ public void shoot(String shotName, TagsEnum... tags) { DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.US); metadata.put("Capture time (UTC)", formatter.format(new Date())); - metadata.put("Chrome full product version", ChromeVersionInfo.getProductVersion()); + metadata.put("Chrome full product version", VersionInfo.getProductVersion()); metadata.put("Android build fingerprint", Build.FINGERPRINT); try { diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java index 12592a12642295..241ed3a2ee9ebb 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java @@ -39,11 +39,11 @@ import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.browser_ui.settings.SettingsLauncher; import org.chromium.components.search_engines.TemplateUrl; import org.chromium.components.search_engines.TemplateUrlService; +import org.chromium.components.version_info.VersionInfo; /** * Unit tests for {@link SearchEngineChoiceNotification}. @@ -169,7 +169,7 @@ public void handleSearchEngineChoice_performedFirstTime() { prefs.contains(ChromePreferenceKeys.SEARCH_ENGINE_CHOICE_PRESENTED_VERSION)); assertEquals("Presented version should be set to the current product version.", - ChromeVersionInfo.getProductVersion(), + VersionInfo.getProductVersion(), prefs.readString( ChromePreferenceKeys.SEARCH_ENGINE_CHOICE_PRESENTED_VERSION, null)); } diff --git a/chrome/android/profiles/newest.txt b/chrome/android/profiles/newest.txt index 2463ed9f5e6695..a4a494ffe34ef8 100644 --- a/chrome/android/profiles/newest.txt +++ b/chrome/android/profiles/newest.txt @@ -1 +1 @@ -chromeos-chrome-amd64-98.0.4758.5_rc-r1-merged.afdo.bz2 +chromeos-chrome-amd64-98.0.4758.7_rc-r1-merged.afdo.bz2 diff --git a/chrome/app/resources/chromium_strings_af.xtb b/chrome/app/resources/chromium_strings_af.xtb index 7ce23afb625bdc..17014e32777893 100644 --- a/chrome/app/resources/chromium_strings_af.xtb +++ b/chrome/app/resources/chromium_strings_af.xtb @@ -36,6 +36,7 @@ Sommige kenmerke kan dalk nie beskikbaar wees nie en veranderings aan voorkeure Vergelyk URL'e met 'n lys onveilige werwe wat in Chromium geberg is. As 'n werf probeer om jou wagwoord te steel, of wanneer jy 'n skadelike lêer aflaai, sal Chromium dalk ook URL'e, insluitend stukkies bladsyinhoud, na Veiligblaai toe stuur. Meld op albei toestelle by Chromium aan om 'n nommer van hier af na jou Android-foon te stuur. Hierdie uitbreiding het verander watter bladsy gewys word wanneer jy Chromium begin. +Gaan voort Die uitbreiding "" het verander watter bladsy gewys word wanneer jy Chromium begin. Chromium het kamera- en mikrofoontoestemming vir hierdie werf nodig In Chromium @@ -112,6 +113,7 @@ Sommige kenmerke kan dalk nie beskikbaar wees nie en veranderings aan voorkeure Verlaat Chromium in elk geval? Laat Chromium in die agtergrond loop Pasmaak en beheer Chromium +Verbeterde beskerming doen meer om uitvissing en wanware te blokkeer Welkom by Chromium; nuwe blaaiervenster is oopgemaak Chromium het nie opgedateer nie; iets het skeefgeloop. Stel Chrome-opdateringprobleme en mislukte opdaterings reg. Gaan voort in 'n nuwe Chromium-profiel? diff --git a/chrome/app/resources/chromium_strings_am.xtb b/chrome/app/resources/chromium_strings_am.xtb index f1fd091fea2d3a..50201835e5dd00 100644 --- a/chrome/app/resources/chromium_strings_am.xtb +++ b/chrome/app/resources/chromium_strings_am.xtb @@ -36,6 +36,7 @@ በChromium ላይ በተከማቹ ደህንነታቸው ያልተጠበቁ ጣቢያዎች ዝርዝር ጋር ዩአርኤሎችን ይፈትሻል። አንድ ጣቢያ የእርስዎን የይለፍ ቃል ለመስረቅ ከሞከረ ወይም ጎጂ ፋይል ሲያወርዱ Chromium እንዲሁም የገጽ ይዘት ቢትስንም ጨምሮ ዩአርኤሎችን ወደ የጥንቃቄ አሰሳ ሊልክ ይችላል። አንድ ቁጥር ከዚህ ወደ የእርስዎ Android ስልክ ለመላክ በሁለቱም መሣሪያዎች ላይ በመለያ ወደ Chromium ይግቡ። ይህ ቅጥያ Chromiumን ሲጀምሩት የሚታየውን ገጽ ቀይሮታል። +ቀጥል ይህ «» ቅጥያ Chromiumን ሲጀምሩት የሚታየውን ገጽ ቀይሮታል። Chromium ለዚህ ጣቢያ የካሜራ እና የማይክሮፎን ፈቃዶች ያስፈልጉታል በChromium ውስጥ @@ -112,6 +113,7 @@ የሆነው ሆኖ ከChromium ይወጣ? Chromium በበስተጀርባ ላይ ያሂድ Chromiumን ያብጁ እና ይቆጣጠሩ +የተሻሻለ ጥበቃ ማስገር እና ተንኮል-አዘል ዌር ለማገድ የበለጠ ይሠራል እንኳን ወደ Chromium በደህና መጡ፤ አዲስ የአሳሽ መስኮት ተከፍቷል Chromium አልተዘመነም፣ የሆነ ችግር ተፈጥሯል። የChrome ዝማኔ ችግሮችን እና ያልተሳኩ ዝማኔዎችን ያስተካክሉ። በአዲሱ የChromium መገለጫ ውስጥ ይቀጥል? diff --git a/chrome/app/resources/chromium_strings_ar.xtb b/chrome/app/resources/chromium_strings_ar.xtb index 704be503f1fbfb..83fe5655396982 100644 --- a/chrome/app/resources/chromium_strings_ar.xtb +++ b/chrome/app/resources/chromium_strings_ar.xtb @@ -34,6 +34,7 @@ ‏يعمل هذا الوضع على التحقّق من عناوين URL التي تحتوي على قائمة بمواقع إلكترونية غير آمنة مُخزّنة في Chromium. وإذا حاول موقع إلكتروني سرقة كلمة المرور أو إذا نزّلت ملفًا ضارًا، قد يرسل متصفِّح Chromium أيضًا عناوين URL تتضمّن أجزاء من محتوى الصفحة إلى "التصفُّح الآمن". ‏لإرسال رقم من هذا الجهاز إلى جهازك الذي يعمل بنظام التشغيل Android، يُرجى تسجيل الدخول إلى Chromium على الجهازَين. ‏غيّرت هذه الإضافة الصفحة التي تظهر عند بدء Chromium. +متابعة ‏غيّرت الإضافة "" الصفحة التي تظهر عند بدء Chromium. ‏يحتاج Chromium إلى إذن للوصول إلى الكاميرا والميكروفون من أجل هذا الموقع الإلكتروني. ‏في Chromium @@ -110,6 +111,7 @@ ‏هل تريد الخروج من Chromium على أي حال؟ ‏السماح بتشغيل Chromium في الخلفية ‏تخصيص Chromium والتحكم فيه +يؤدي تفعيل إعداد "الحماية المُحسَّنة" إلى حظر التصيّد الاحتيالي والبرامج الضارّة. ‏مرحبًا بك في Chromium. تم فتح نافذة متصفّح جديدة. ‏تعذّر تحديث Chromium بسبب حدوث خطأ. حلّ مشاكل تحديث Chrome وتعذُّر التحديثات ‏هل تريد المتابعة باستخدام ملف شخصي جديد على Chromium؟ diff --git a/chrome/app/resources/chromium_strings_as.xtb b/chrome/app/resources/chromium_strings_as.xtb index 4ab9ea971824f1..8878e35be62059 100644 --- a/chrome/app/resources/chromium_strings_as.xtb +++ b/chrome/app/resources/chromium_strings_as.xtb @@ -36,6 +36,7 @@ Chromiumত ষ্ট’ৰ কৰি ৰখা অসুৰক্ষিত ছাইটসমূহৰ এখন সূচীৰ সৈতে URLসমূহ পৰীক্ষা কৰে। যদি কোনোবা ছাইটে আপোনাৰ পাছৱৰ্ড চুৰি কৰিবলৈ চেষ্টা কৰে অথবা আপুনি কোনো ক্ষতিকাৰক ফাইল ডাউনল’ড কৰাৰ সময়ত Chromiumএ পৃষ্ঠাৰ সমলৰ বিটসমূহকে ধৰি URLসমূহো সুৰক্ষিত ব্ৰাউজিঙলৈ পঠিয়াব পাৰে। ইয়াৰ পৰা আপোনাৰ Android ফ’নলৈ নম্বৰ পঠিয়াবলৈ দুয়োটা ডিভাইচত Chromiumত ছাইন ইন কৰক। আপুনি Chromium আৰম্ভ কৰিলে কি পৃষ্ঠা দেখুওৱা হ‘ব এই এক্সটেনশ্বনটোৱে সেইটো সলনি কৰিছে। +অব্যাহত ৰাখক আপুনি Chromium আৰম্ভ কৰিলে কোনটো পৃষ্ঠা দেখুওৱা হ’ব সেয়া "" এক্সটেনশ্বনে সলনি কৰিছে৷ Chromiumক এই ছাইটটোৰ বাবে মাইক্ৰ’ফ’ন আৰু কেমেৰাৰ অনুমতিৰ আৱশ্যক Chromiumত @@ -112,6 +113,7 @@ যিকোনো প্ৰকাৰে Chromiumৰ পৰা বাহিৰ হ’বনে? Chromiumক নেপথ্যত চলিবলৈ দিয়ক Chromium কাষ্টমাইজ আৰু নিয়ন্ত্ৰণ কৰক +বৰ্ধিত সুৰক্ষাৰ সুবিধাটোৱে ফিশ্বিং আৰু মালৱেৰ অৱৰোধ কৰিবলৈ অধিক কাৰ্য কৰে Chromiumলৈ স্বাগতম; নতুন ব্ৰাউজাৰৰ ৱিণ্ড’ খোলা হৈছে Chromium আপডে'ট হোৱা নাই, কিবা ভুল হৈছে। Chromiumৰ আপডে'ট সম্পর্কীয় সমস্যাবোৰ আৰু বিফল হোৱা আপডে'টসমূহ সমাধান কৰক। এটা নতুন Chromium প্ৰ'ফাইলত অব্যাহত ৰাখিবনে? diff --git a/chrome/app/resources/chromium_strings_az.xtb b/chrome/app/resources/chromium_strings_az.xtb index c2075405c6e4ee..cffcb4d21fd20e 100644 --- a/chrome/app/resources/chromium_strings_az.xtb +++ b/chrome/app/resources/chromium_strings_az.xtb @@ -36,6 +36,7 @@ Bəzi funksiyalar əlçatmaz ola bilər ki, nəticədə tərcihlərə edilən d URL'ləri Chromium'da saxlanılan təhlükəli saytların siyahısı ilə yoxlayır Sayt parolunuzu oğurlamağa çalışdıqda və ya zərərli fayl endirdiyinizdə Chromium səhifə məzmunundan kiçik nümunələr də daxil olmaqla, URL'ləri Təhlükəsiz Baxışa göndərə bilər. Buradan Android telefonunuza nömrə göndərmək üçün hər iki cihazda Chromium'a daxil olun. Bu artırma Chromium'u başlatdığınız zaman hansı səhifənin göstərildiyini dəyişdi. +Davam edin "" artırması Chromium'u başlatdığınız zaman hansı səhifənin göstərildiyini dəyişdi. Chromium bu sayt üçün kamera və mikrofon icazəsi tələb edir Chromium'da @@ -110,6 +111,7 @@ Bəzi funksiyalar əlçatmaz ola bilər ki, nəticədə tərcihlərə edilən d Chromium'dan istənilən halda çıxılsın? Chromium'a Arxa Fonda İşləmək İcazəsi Verin Fərdiləşdirin və Chromium'u kontrol edin +Təkmil qoruma ilə fişinq və zərərli proqramların bloklanması üçün daha çox iş görülür Chromium'a xoş gəlmisiniz; yeni brauzer pəncərəsi açılıb Chromium güncəllənmədi, xəta baş verdi. Chrome'un güncəllənmə problemlərini və alınmayan güncəllənmələri həll edin. Yeni Chromium profilində davam edilsin? diff --git a/chrome/app/resources/chromium_strings_be.xtb b/chrome/app/resources/chromium_strings_be.xtb index 8d391cb2461586..c4e4b2adf19981 100644 --- a/chrome/app/resources/chromium_strings_be.xtb +++ b/chrome/app/resources/chromium_strings_be.xtb @@ -36,6 +36,7 @@ Правярае, ці знаходзяцца URL-адрасы ў спісе небяспечных сайтаў, захаваным у Chromium. Пры спробе сайта выкрасці пароль або пры спампоўванні шкоднага файла браўзер Chromium можа таксама адпраўляць у Бяспечны прагляд URL-адрасы, уключаючы фрагменты змесціва старонкі. Каб адпраўляць нумары з гэтай прылады на свой тэлефон Android, увайдзіце ў Chromium на абедзвюх прыладах. Гэта пашырэнне змяніла старонку, якая паказваецца пры запуску Chromium. +Працягнуць Пашырэнне "" змяніла старонку, якая паказваецца пры запуску Chromium. Chromium запытвае дазвол на доступ да камеры і мікрафона для гэтага сайта У Chromium @@ -112,6 +113,7 @@ Усё роўна выйсці з Chromium? Дазволіць браўзеру Chromium працаваць у фоне Наладка і кіраванне Chromium +Функцыя палепшанай абароны яшчэ надзейней блакіруе фішынг і шкодныя праграмы Вітаем у Chromium! Адкрыта новае акно браўзера Chromium не абнавіўся. Нешта пайшло не так. Выправіце праблемы з абнаўленнем Chromium і памылкі абнаўлення. Працягнуць працу ў новым профілі Chromium? diff --git a/chrome/app/resources/chromium_strings_bg.xtb b/chrome/app/resources/chromium_strings_bg.xtb index 9ffd44e9e77829..cd2dc1dbc8577d 100644 --- a/chrome/app/resources/chromium_strings_bg.xtb +++ b/chrome/app/resources/chromium_strings_bg.xtb @@ -34,6 +34,7 @@ Проверка на URL адресите в съхраняван в Chromium списък с опасни сайтове. Ако сайт се опита да открадне паролата ви или изтеглите опасен файл от сайт, Chromium може също така да изпрати до „Безопасно сърфиране“ URL адресите и част от съдържанието на страницата. За да изпратите номер от тук до телефона си с Android, влезте в Chromium и на двете устройства. Това разширение промени страницата, която се показва при стартиране на Chromium. +Напред Разширението „“ промени страницата, която се показва при стартиране на Chromium. За този сайт Chromium се нуждае от разрешения за достъп до камерата и микрофона В Chromium @@ -108,6 +109,7 @@ Искате ли да излезете от Chromium въпреки това? Разрешаване на Chromium да се изпълнява на заден план Персонализиране и контролиране на Chromium +Режимът за подобрена защита предприема повече действия за блокиране на фишинг атаки и злонамерен софтуер Добре дошли в Chromium. Отворен е нов прозорец на браузъра Chromium не се актуализира, защото нещо се обърка. Отстранете проблеми с актуализирането на Chromium и неуспешни актуализации. Искате ли да продължите с нов потребителски профил в Chromium? diff --git a/chrome/app/resources/chromium_strings_bn.xtb b/chrome/app/resources/chromium_strings_bn.xtb index 52cf7ca479bb40..92bc8f491fde57 100644 --- a/chrome/app/resources/chromium_strings_bn.xtb +++ b/chrome/app/resources/chromium_strings_bn.xtb @@ -34,6 +34,7 @@ Chromium-এ স্টোর করা নিরাপদ নয় এমন সাইটের তালিকা থেকে সেগুলির URL গুলি পরীক্ষা করে দেখে। যদি কোনও সাইট আপনার পাসওয়ার্ড চুরি করার চেষ্টা করে বা আপনি কোনও ক্ষতিকারক ফাইল ডাউনলোড করলে, Safe Browsing-এ Chromium পৃষ্ঠার কিছু কন্টেন্ট সহ URL গুলিও হয়ত পাঠাতে পারে। এখান থেকে আপনার Android ফোনে একটি নম্বর পাঠাতে, উভয় ডিভাইসের Chromium-এ সাইন-ইন করুন। আপনি Chromium চালু করলে কোন পৃষ্ঠাটি দেখানো হবে তা এই এক্সটেনশনটি পরিবর্তন করেছে। +চালিয়ে যান আপনি Chromium চালু করলে কোন পৃষ্ঠাটি দেখানো হবে তা "" এক্সটেনশনটি পরিবর্তন করেছে। এই সাইটের জন্য Chromium-এর ক্যামেরা ও মাইক্রোফোন অ্যাক্সেসের অনুমতি প্রয়োজন Chromium এ @@ -110,6 +111,7 @@ তা স্বত্তেও Chromium ছেড়ে যাবেন? Chromium-কে ব্যাকগ্রাউন্ডে চলতে দিন Chromium কাস্টমাইজ ও নিয়ন্ত্রণ করুন +ফিশিং ও ম্যালওয়্যার ব্লক করার ব্যাপারে উন্নত সুরক্ষা আরও সাহায্য করে Chromium-এ স্বাগতম; নতুন ব্রাউজার উইন্ডো খোলা হয়েছে Chromium আপডেট করা যায়নি, কোনও সমস্যা হয়েছে। Chromium আপডেট করতে না পারার সমস্যা ও আপডেট করা যায়নি এমন সমস্যার সমাধান করুন। এক্ষেত্রে নতুন Chromium প্রোফাইল তৈরি করতে চান? diff --git a/chrome/app/resources/chromium_strings_bs.xtb b/chrome/app/resources/chromium_strings_bs.xtb index aa10fb873a1ba0..5e395c3911c863 100644 --- a/chrome/app/resources/chromium_strings_bs.xtb +++ b/chrome/app/resources/chromium_strings_bs.xtb @@ -36,6 +36,7 @@ Neke funkcije možda neće biti dostupne i promjene postavki se neće sačuvati. Provjerava URL-ove s listom nesigurnih web lokacija pohranjenih u Chromiumu. Ako web lokacija pokuša ukrasti vašu lozinku ili kada preuzimate štetan fajl, Chromium može slati i URL-ove, uključujući dijelove sadržaja stranice, u Sigurno pregledanje. Da pošaljete broj s ovog uređaja na svoj Android telefon, prijavite se u Chromium na oba uređaja. Ova ekstenzija je promijenila stranicu koja se prikazuje prilikom pokretanja Chromiuma. +Nastavi Ekstenzija "" je promijenila stranicu koja se prikazuje prilikom pokretanja Chromiuma. Chromiumu su za ovu web lokaciju potrebna odobrenja za kameru i mikrofon U Chromiumu @@ -112,6 +113,7 @@ Neke funkcije možda neće biti dostupne i promjene postavki se neće sačuvati. Želite li ipak zatvoriti Chromium? Neka Chromium radi u pozadini Prilagodite Chromium i upravljajte njime +Poboljšana zaštita vas još bolje čuva od krađe identiteta i zlonamjernog softvera Dobro došli u Chromium. Otvoren je novi prozor preglednika Ažuriranje Chromiuma nije uspjelo. Nešto nije uredu. Ispravite probleme s ažuriranjem Chromiuma i neuspjela ažuriranja. Želite li nastaviti na novom Chromium profilu? diff --git a/chrome/app/resources/chromium_strings_ca.xtb b/chrome/app/resources/chromium_strings_ca.xtb index 12a53426f1efe2..071f1059027859 100644 --- a/chrome/app/resources/chromium_strings_ca.xtb +++ b/chrome/app/resources/chromium_strings_ca.xtb @@ -34,6 +34,7 @@ Compara els URL amb una llista de llocs web no segurs emmagatzemada a Chromium. Si un lloc web prova de robar-te la contrasenya o si baixes un fitxer maliciós, és possible que Chromium també n'enviï els URL, inclosos fragments de contingut de les pàgines, a Navegació segura. Per enviar un número d'aquí al teu telèfon Android, inicia la sessió a Chromium en tots dos dispositius. Aquesta extensió ha canviat la pàgina que es mostra quan inicieu Chromium. +Continua L'extensió ha canviat la pàgina que es mostra quan inicieu Chromium. Chromium necessita permís d'accés a la càmera i al micròfon per a aquest lloc web A Chromium @@ -110,6 +111,7 @@ Vols sortir de Chromium igualment? Permet que Chromium s'executi en segon pla Personalitza i controla Chromium +La protecció millorada és més efiçaç a l'hora de bloquejar la pesca de credencials i el programari maliciós Et donem la benvinguda a Chromium; s'ha obert una altra finestra del navegador No s'ha actualitzat Chromium. S'ha produït un error. Soluciona els problemes i errors d'actualització de Chromium. Vols continuar en un perfil de Chromium nou? diff --git a/chrome/app/resources/chromium_strings_cs.xtb b/chrome/app/resources/chromium_strings_cs.xtb index 83b307e5c5da44..43d188bc8c9e47 100644 --- a/chrome/app/resources/chromium_strings_cs.xtb +++ b/chrome/app/resources/chromium_strings_cs.xtb @@ -36,6 +36,7 @@ Některé funkce možná nebudou k dispozici a změny nastavení se neuloží.Kontroluje adresy URL oproti seznamu nebezpečných webů uloženému v prohlížeči Chromium. Pokud se web pokusí odcizit vám heslo nebo když stáhnete škodlivý soubor, může Chromium Bezpečnému prohlížení odeslat také adresy URL, včetně částí obsahu stránky. Pokud odtud chcete odeslat číslo do telefonu Android, v obou zařízeních se přihlaste do prohlížeče Chromium. Toto rozšíření změnilo stránku, která se zobrazí při spuštění prohlížeče Chromium. +Pokračovat Rozšíření změnilo stránku, která se zobrazí při spuštění prohlížeče Chromium. Chromium pro tento web potřebuje přístup k fotoaparátu a mikrofonu V prohlížeči Chromium @@ -112,6 +113,7 @@ Některé funkce možná nebudou k dispozici a změny nastavení se neuloží.Přesto Chromium ukončit? Nechat Chromium běžet na pozadí Přizpůsobit a ovládat Chromium +Vylepšená ochrana vás lépe ochrání před phishingem a malwarem Vítá vás Chromium; bylo otevřeno nové okno prohlížeče Prohlížeč Chromium se neaktualizoval, něco se pokazilo. Vyřešte problémy se stahováním aktualizací prohlížeče Chromium a neúspěšnými aktualizacemi. Pokračovat v novém profilu Chromium? diff --git a/chrome/app/resources/chromium_strings_da.xtb b/chrome/app/resources/chromium_strings_da.xtb index 348b4089d2f6bc..d13c442ce87d5e 100644 --- a/chrome/app/resources/chromium_strings_da.xtb +++ b/chrome/app/resources/chromium_strings_da.xtb @@ -34,6 +34,7 @@ Tjekker webadresser ift. en liste over usikre websites, der er gemt i Chromium. Hvis et website forsøger at stjæle din adgangskode, eller hvis du downloader en skadelig fil, sender Chromium muligvis også webadresser og bl.a. mindre mængder sideindhold til Beskyttet browsing. Hvis du vil sende et nummer fra denne enhed til din Android-telefon, skal du logge ind på Chromium på begge enheder. Denne udvidelse har ændret din startside i Chromium. +Fortsæt Udvidelsen "" har ændret din startside i Chromium. Chromium skal have adgangstilladelse til kamera og mikrofon for at bruge dette website I Chromium @@ -110,6 +111,7 @@ Vil du afslutte Chromium alligevel? Lad Chromium køre i baggrunden Tilpas og kontrollér Chromium +Forbedret beskyttelse gør mere end at blokere phishing og malware Velkommen til Chromium – Et nyt browservindue er åbnet Chromium kunne ikke opdateres, da der opstod en fejl. Løs problemer med opdatering af Chromium og mislykkede opdateringer. Vil du fortsætte på en ny Chromium-profil? diff --git a/chrome/app/resources/chromium_strings_de.xtb b/chrome/app/resources/chromium_strings_de.xtb index dcdb13821a05cf..07b9a1871fdc5a 100644 --- a/chrome/app/resources/chromium_strings_de.xtb +++ b/chrome/app/resources/chromium_strings_de.xtb @@ -34,6 +34,7 @@ Prüft URLs anhand einer Liste unsicherer Websites, die in Chromium gespeichert ist. Wenn eine Website versucht, Ihr Passwort zu stehlen, oder wenn Sie eine schädliche Datei herunterladen, kann Chromium auch URLs, einschließlich Teile von Seiteninhalten, an Safe Browsing senden. Wenn Sie eine Nummer von diesem Gerät an Ihr Android-Smartphone senden möchten, müssen Sie sich auf beiden Geräten in Chromium anmelden. Die beim Start von Chromium angezeigte Seite wurde durch diese Erweiterung geändert. +Weiter Die beim Start von Chromium angezeigte Seite wurde durch die Erweiterung geändert. Chromium benötigt die Kamera- und Mikrofonberechtigungen für diese Website In Chromium @@ -110,6 +111,7 @@ Chromium trotzdem beenden? Chromium im Hintergrund ausführen Chromium anpassen und einstellen +Besserer Schutz vor Phishing und Malware durch erweitertes Safe Browsing Willkommen bei Chromium; neues Browserfenster geöffnet Chrome wurde aufgrund eines Fehlers nicht aktualisiert. Wie Sie Updateprobleme und Fehler bei der Aktualisierung von Chromium beheben, erfahren Sie hier. Mit einem neuen Chromium-Profil fortfahren? diff --git a/chrome/app/resources/chromium_strings_el.xtb b/chrome/app/resources/chromium_strings_el.xtb index 4f3ec4be7dc793..cec12decec6a8d 100644 --- a/chrome/app/resources/chromium_strings_el.xtb +++ b/chrome/app/resources/chromium_strings_el.xtb @@ -34,6 +34,7 @@ Ελέγχει εάν τα URL περιλαμβάνονται στη λίστα μη ασφαλών ιστοτόπων που είναι αποθηκευμένη στο Chromium. Εάν ένας ιστότοπος προσπαθήσει να υποκλέψει τον κωδικό πρόσβασής σας ή όταν κατεβάζετε ένα επιβλαβές αρχείο, το Chromium μπορεί επίσης να στείλει URL, καθώς και τμήματα του περιεχομένου της σελίδας, στην Ασφαλή περιήγηση. Για να στείλετε από εδώ έναν αριθμό στο τηλέφωνό σας Android, συνδεθείτε στο Chromium και στις δύο συσκευές. Αυτή η επέκταση άλλαξε τη σελίδα που εμφανίζεται κατά την εκκίνηση του Chromium. +Συνέχεια Η επέκταση άλλαξε τη σελίδα που εμφανίζεται κατά την εκκίνηση του Chromium. Το Chromium χρειάζεται άδεια μικροφώνου και κάμερας για αυτόν τον ιστότοπο. Στο Chromium @@ -110,6 +111,7 @@ Να γίνει έξοδος από το Chromium ούτως ή άλλως; Να επιτρέπεται στο Chromium να εκτελείται στο παρασκήνιο Προσαρμογή και έλεγχος του Chromium +Η βελτιωμένη προστασία κάνει περισσότερα για τον αποκλεισμό ηλεκτρονικού ψαρέματος (phishing) και κακόβουλων προγραμμάτων Καλωσορίσατε στο Chromium. Ένα νέο παράθυρο προγράμματος περιήγησης έχει ανοίξει. Δεν έγινε ενημέρωση του Chromium, παρουσιάστηκε κάποιο σφάλμα. Επιδιορθώστε τα προβλήματα ενημέρωσης και αποτυχημένων ενημερώσεων του Chromium. Συνέχεια σε νέο προφίλ Chromium; diff --git a/chrome/app/resources/chromium_strings_en-GB.xtb b/chrome/app/resources/chromium_strings_en-GB.xtb index 5b9b2cc13317a8..6c631c16c083fc 100644 --- a/chrome/app/resources/chromium_strings_en-GB.xtb +++ b/chrome/app/resources/chromium_strings_en-GB.xtb @@ -36,6 +36,7 @@ Some features may be unavailable and changes to preferences won't be saved.Checks URLs with a list of unsafe sites stored in Chromium. If a site tries to steal your password, or when you download a harmful file, Chromium may also send URLs, including bits of page content, to Safe Browsing. To send a number from here to your Android phone, sign in to Chromium on both devices. This extension has changed the page that is shown when you start Chromium. +Continue The extension "" has changed the page that is shown when you start Chromium. Chromium needs camera and microphone permissions for this site In Chromium @@ -112,6 +113,7 @@ Some features may be unavailable and changes to preferences won't be saved.Exit Chromium anyway? Let Chromium Run in the Background Customise and control Chromium +Enhanced protection does more to block phishing and malware Welcome to Chromium; new browser window opened Chromium didn't update. Something went wrong. Fix Chromium update problems and failed updates. Continue in a new Chromium profile? diff --git a/chrome/app/resources/chromium_strings_es-419.xtb b/chrome/app/resources/chromium_strings_es-419.xtb index 8358d55036faf2..765f10e5b2ff7d 100644 --- a/chrome/app/resources/chromium_strings_es-419.xtb +++ b/chrome/app/resources/chromium_strings_es-419.xtb @@ -34,6 +34,7 @@ Revisa las URL con una lista de sitios no seguros almacenados en Chromium. Si un sitio intenta robar tu contraseña, o cuando descargas un archivo dañino, es posible que Chromium también envíe las URL, con partes del contenido de la página, a la Navegación segura. Para enviar un número desde aquí a tu teléfono Android, accede a Chromium en ambos dispositivos. Esta extensión cambió la página que se muestra al iniciar Chromium. +Continuar La extensión "" cambió la página que se muestra al iniciar Chromium. Chromium necesita permiso de acceso al micrófono y la cámara para este sitio. En Chromium @@ -108,6 +109,7 @@ ¿Deseas salir de Chromium de todos modos? Permitir que Chromium se ejecute en segundo plano Personaliza y controla Chromium +La protección mejorada permite bloquear mejor la suplantación de identidad (phishing) y el software malicioso. Te damos la bienvenida a Chromium; se abrió una nueva ventana del navegador No se actualizó Chromium porque se produjo un error. Soluciona los problemas de actualización y las actualizaciones con error de Chromium. ¿Deseas continuar en un nuevo perfil de Chromium? diff --git a/chrome/app/resources/chromium_strings_es.xtb b/chrome/app/resources/chromium_strings_es.xtb index f21080a16fa421..fd54488b2481b0 100644 --- a/chrome/app/resources/chromium_strings_es.xtb +++ b/chrome/app/resources/chromium_strings_es.xtb @@ -36,6 +36,7 @@ Es posible que algunas funciones no estén disponibles y que no se guarden los c Comprueba las URLs guardadas en Chromium con una lista de sitios que no son seguros. Si un sitio intenta robarte tu contraseña o si te descargas un archivo dañino, puede que Chromium también envíe URLs, así como fragmentos de contenido de la página, a Navegación segura. Para enviar un número desde aquí a tu teléfono Android, inicia sesión en Chromium con ambos dispositivos. Esta extensión ha cambiado la página que se muestra al iniciar Chromium. +Continuar La extensión ha cambiado la página que se muestra al iniciar Chromium. Chromium necesita los permisos del micrófono y de la cámara para este sitio En Chromium @@ -112,6 +113,7 @@ Es posible que algunas funciones no estén disponibles y que no se guarden los c ¿Quieres salir de Chromium de todas formas? Permitir que Chromium se ejecute en segundo plano Personaliza y controla Chromium +La protección mejorada es más eficaz para bloquear ataques de suplantación de identidad y software malicioso. Te damos la bienvenida a Chromium. Se ha abierto una nueva ventana del navegador. Chromium no se ha actualizado, algo no va bien. Soluciona los problemas y errores de actualización de Chromium. ¿Continuar en un nuevo perfil de Chromium? diff --git a/chrome/app/resources/chromium_strings_et.xtb b/chrome/app/resources/chromium_strings_et.xtb index 7b1402765579f8..cb245746f58528 100644 --- a/chrome/app/resources/chromium_strings_et.xtb +++ b/chrome/app/resources/chromium_strings_et.xtb @@ -34,6 +34,7 @@ Kontrollib URL-e Chromiumi talletatud ohtlike saitide loendi alusel. Kui sait üritab teie parooli varastada või laadite alla kahjuliku faili, võib Chromium saata URL-id ja lehe sisu osad teenusesse Google'i ohutu sirvimine. Numbri saatmiseks siit Android-telefoni logige mõlemas seadmes Chromiumi sisse. See laiendus muutis seda, milline leht kuvatakse Chromiumi käivitamisel. +Jätka Laiendus „” muutis seda, milline leht kuvatakse Chromiumi käivitamisel. Chromium vajab selle saidi puhul kaamera ja mikrofoni kasutamise luba Chromiumis @@ -110,6 +111,7 @@ Kas väljuda Chromiumist ikkagi? Luba Chromiumil taustal töötada Chromiumi kohandamine ja juhtimine +Täiustatud kaitse aitab andmepüüki ja pahavara paremini blokeerida Tere tulemast Chromiumi; avati uus brauseriaken Chromiumit ei värskendatud, midagi läks valesti. Lahendage Chromiumi värskendamisprobleemid ja parandage ebaõnnestunud värskendused. Kas jätkata uuel Chromiumi profiilil? diff --git a/chrome/app/resources/chromium_strings_eu.xtb b/chrome/app/resources/chromium_strings_eu.xtb index 41073a3a0176a1..2f4f01a0c8c51e 100644 --- a/chrome/app/resources/chromium_strings_eu.xtb +++ b/chrome/app/resources/chromium_strings_eu.xtb @@ -36,6 +36,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak URLak Chromium-en gordetako webgune ez-seguruen zerrendan dauden ala ez egiaztatzen du. Webguneren bat pasahitza lapurtzen saiatzen bada, edo fitxategi kaltegarriren bat deskargatzen baduzu, baliteke Chromium-ek URLak ere bidaltzea (orriko edukiaren zati batzuk barne) Arakatze segurua eginbideari. Zenbaki bat hemendik Android-eko telefonora bidaltzeko, hasi Chromium-eko saioa bi gailuetan. Luzapenak aldatu egin du Chromium abiarazten duzunean agertzen den orria. +Egin aurrera luzapenak aldatu egin du Chromium abiarazten duzunean agertzen den orria. Chromium-ek kamera eta mikrofonoa atzitzeko baimenak behar ditu webgune honetan Chromium-en @@ -112,6 +113,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak Chromium-etik irten nahi duzu hala ere? Onartu Chromium atzeko planoan abiaraztea Pertsonalizatu eta kontrolatu Chromium +Babes handiagoa eskaintzen du phishingaren eta malwarearen aurka Ongi etorri Chromium-era; beste leiho bat ireki da arakatzailean Chromium ez da eguneratu arazoren bat izan delako. Konpondu Chromium eguneratzeko arazoak eta huts egindako eguneratzeak. Chromium-eko beste profil batean egin nahi duzu aurrera? diff --git a/chrome/app/resources/chromium_strings_fa.xtb b/chrome/app/resources/chromium_strings_fa.xtb index 622af2b84399f6..c5f457259d7996 100644 --- a/chrome/app/resources/chromium_strings_fa.xtb +++ b/chrome/app/resources/chromium_strings_fa.xtb @@ -34,6 +34,7 @@ ‏نشانی‌های وب را با فهرست سایت‌های ناامنی که در Chromium ذخیره شده است مقایسه می‌کند. اگر سایتی تلاش کند گذرواژه شما را به‌سرقت ببرد، یا وقتی فایل مخربی بارگیری می‌کنید، Chromium ممکن است نشانی‌های وب را نیز به‌همراه بخش‌های کوچکی از محتوای صفحه به «مرور ایمن» ارسال کند. ‏برای ارسال شماره از اینجا به تلفن Android خود، در هر دو دستگاه به سیستم Chromium وارد شوید. ‏این افزونه، صفحه‌ای را تغییر داده است که هنگام راه‌اندازی Chromium نشان داده می‌شود. +ادامه ‏افزونه «»، صفحه‌ای را تغییر داده است که هنگام راه‌اندازی Chromium نشان داده می‌شود. ‏Chromium برای این سایت به اجازه دوربین و میکروفون نیاز دارد ‏در Chromium @@ -109,6 +110,7 @@ ‏درهرصورت از Chromium خارج می‌شوید؟ ‏اجازه به Chromium برای اجرا در پس‌زمینه ‏سفارشی کردن و کنترل Chromium +«محافظت بهبودیافته» کارهای بیشتری برای مسدود کردن رمزگیری و بدافزار انجام می‌دهد ‏به Chromium خوش‌آمدید؛ پنجره مرورگر جدید راه‌اندازی شد ‏Chromium به‌روزرسانی نشد؛ مشکلی پیش آمد. مشکلات به‌روزرسانی Chromium و به‌روزرسانی‌های ناموفق را برطرف کنید. ‏در نمایه جدید Chromium ادامه می‌دهید؟ diff --git a/chrome/app/resources/chromium_strings_fi.xtb b/chrome/app/resources/chromium_strings_fi.xtb index 9fec27e8067bf1..7d20e64d527c1f 100644 --- a/chrome/app/resources/chromium_strings_fi.xtb +++ b/chrome/app/resources/chromium_strings_fi.xtb @@ -34,6 +34,7 @@ Tarkistaa URL-osoitteet Chromiumiin tallennetun vaarallisten sivustojen luettelon avulla. Jos sivusto yrittää varastaa salasanaasi tai jos lataat haitallisen tiedoston, Chromium voi myös lähettää Selaussuojan tarkistettavaksi URL-osoitteita, myös osia sivujen sisällöstä. Jos haluat lähettää numeron täältä Android-puhelimeesi, kirjaudu Chromiumiin molemmilla laitteilla. Tämä laajennus on vaihtanut Chromiumin aloitussivun. +Jatka Laajennus on vaihtanut Chromiumin aloitussivun. Chromium tarvitsee kameran ja mikrofonin luvan tällä sivustolla Chromiumissa @@ -110,6 +111,7 @@ Suljetaanko Chromium silti? Jätä Chromium käyntiin taustalle Chromiumin muokkaus ja hallinta +Parannettu suojaus torjuu tietojenkalastelua ja haittaohjelmia entistä tehokkaammin Tervetuloa Chromiumiin, uusi selainikkuna avattu Chromiumia ei päivitetty, vaan jotain meni pieleen. Korjaa Chromiumin päivitysongelmat ja epäonnistuneet päivitykset. Jatketaanko uudessa Chromium-profiilissa? diff --git a/chrome/app/resources/chromium_strings_fil.xtb b/chrome/app/resources/chromium_strings_fil.xtb index e3ada6b93a57ba..b3a86daea54ba5 100644 --- a/chrome/app/resources/chromium_strings_fil.xtb +++ b/chrome/app/resources/chromium_strings_fil.xtb @@ -36,6 +36,7 @@ Maaaring hindi available ang ilang tampok at hindi mase-save ang mga pagbabago s Sinusuri ang mga URL sa pamamagitan ng listahan ng mga hindi ligtas na site na naka-store sa Chromium. Kung susubukan ng site na nakawin ang iyong password, o kapag nag-download ka ng mapaminsalang file, posible ring magpadala ang Chromium sa Ligtas na Pag-browse ng mga URL, kabilang ang ilang content ng page. Para magpadala ng numero sa iyong Android phone mula rito, mag-sign in sa Chromium sa parehong device. Binago ng extension na ito ang ipinapakitang page kapag sinimulan mo ang Chronium. +Magpatuloy Binago ng extension na "" ang ipinapakitang page kapag sinimulan mo ang Chromium. Kailangan ng Chromium ng pahintulot sa camera at mikropono para sa site na ito Sa Chromium @@ -112,6 +113,7 @@ Maaaring hindi available ang ilang tampok at hindi mase-save ang mga pagbabago s Lumabas pa rin sa Chromium? Hayaang Tumakbo ang Chromium sa Background I-customize at kontrolin ang Chromium +Mas maraming magagawa ang pinahusay na proteksyon para mag-block ng phishing and malware Welcome sa Chromium; binuksan ang bagong window ng browser Hindi na-update ang Chromium, nagkaproblema. Ayusin ang mga problema sa pag-update ng Chromium at ang mga hindi naisagawang pag-update dito. Magpatuloy sa bagong profile sa Chromium? diff --git a/chrome/app/resources/chromium_strings_fr-CA.xtb b/chrome/app/resources/chromium_strings_fr-CA.xtb index 8ed3f39caf2f14..2a34988ef8ef31 100644 --- a/chrome/app/resources/chromium_strings_fr-CA.xtb +++ b/chrome/app/resources/chromium_strings_fr-CA.xtb @@ -36,6 +36,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles et les modificat Il vérifie les URL en fonction d'une liste de sites non sécuritaires stockée dans Chromium. Si un site tente de voler votre mot de passe ou si vous téléchargez un fichier dangereux, Chromium peut également envoyer les URL concernées, y compris des extraits du contenu de pages, à la navigation sécurisée. Pour envoyer un numéro d'ici vers votre téléphone Android, connectez-vous à Chromium sur vos deux appareils. Cette extension a modifié la page qui s'affiche au démarrage de Chromium. +Continuer L'extension «  » a modifié la page qui s'affiche au démarrage de Chromium. Chromium requiert l'autorisation d'accéder au microphone et à l'appareil photo pour ce site Dans Chromium @@ -112,6 +113,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles et les modificat Quitter Chromium quand même? Laisser Chromium s'exécuter en arrière-plan Personnaliser et commander Chrome +La protection renforcée en fait plus pour bloquer l'hameçonnage et les logiciels nuisibles Bienvenue à Chromium, une nouvelle fenêtre de navigateur a été ouverte La mise à jour de Chromium n'a pas été installée. Une erreur s'est produite. Découvrez comment résoudre les problèmes de mise à jour de Chromium. Continuer avec un nouveau profil Chromium? diff --git a/chrome/app/resources/chromium_strings_fr.xtb b/chrome/app/resources/chromium_strings_fr.xtb index 7c218264136249..2540b49f942424 100644 --- a/chrome/app/resources/chromium_strings_fr.xtb +++ b/chrome/app/resources/chromium_strings_fr.xtb @@ -35,6 +35,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles, et les modifica Il vérifie les URL d'après une liste de sites dangereux stockée dans Chromium. Si un site tente de voler votre mot de passe ou si vous téléchargez un fichier dangereux, Chromium peut également envoyer les URL concernées, y compris des extraits du contenu de pages, à la fonctionnalité de navigation sécurisée. Pour envoyer un numéro d'ici vers votre téléphone Android, connectez-vous à Chromium sur les deux appareils. Cette extension a modifié la page qui s'affiche lorsque vous démarrez Chromium. +Continuer L'extension a modifié la page qui s'affiche lorsque vous démarrez Chromium. Chromium a besoin de l'autorisation d'accéder au micro et à la caméra pour ce site Dans Chromium @@ -111,6 +112,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles, et les modifica Quitter Chromium quand même ? Laisser Chromium s'exécuter en arrière-plan Personnaliser et contrôler Chromium +La protection renforcée assure une meilleure protection contre l'hameçonnage et les logiciels malveillants Bienvenue dans Chromium, une nouvelle fenêtre du navigateur a été ouverte Échec de la mise à jour de Chromium en raison d'une erreur. Découvrez comment résoudre ce type de problème. Continuer avec un nouveau profil Chromium ? diff --git a/chrome/app/resources/chromium_strings_gl.xtb b/chrome/app/resources/chromium_strings_gl.xtb index c1f54d2fc48028..885ff9eaae49db 100644 --- a/chrome/app/resources/chromium_strings_gl.xtb +++ b/chrome/app/resources/chromium_strings_gl.xtb @@ -36,6 +36,7 @@ Comproba enderezos URL cunha lista de sitios non seguros almacenada en Chromium. Se un sitio tenta roubarche o contrasinal ou se descargas un ficheiro daniño, Chromium tamén pode comprobar os enderezos URL, entre os que se inclúen fragmentos de contido das páxinas, a través da función Navegación segura. Para enviar un número desde aquí ao teu teléfono Android, inicia sesión en Chromium nos dous dispositivos. Esta extensión cambiou a páxina que se mostra ao iniciar Chromium. +Continuar A extensión "" cambiou a páxina que se mostra ao iniciar Chromium. Chromium necesita permiso de acceso á cámara e ao micrófono para este sitio En Chromium @@ -112,6 +113,7 @@ Queres saír de Chromium de todas formas? Deixar que Chromium se execute en segundo plano Personaliza e controla Chromium +A protección mellorada é máis eficaz á hora de bloquear o phishing e o software malicioso Dámosche a benvida a Chromium. Abriuse unha nova ventá do navegador Chromium non se actualizou, xa que se produciu un erro. Soluciona os problemas de actualización de Chromium e as actualizacións que non se puidesen realizar. Queres continuar nun perfil de Chromium novo? diff --git a/chrome/app/resources/chromium_strings_gu.xtb b/chrome/app/resources/chromium_strings_gu.xtb index 57f2da2bf22ec1..a54a54744eca82 100644 --- a/chrome/app/resources/chromium_strings_gu.xtb +++ b/chrome/app/resources/chromium_strings_gu.xtb @@ -36,6 +36,7 @@ URLsને Chromiumમાં સંગ્રહિત અસુરક્ષિત સાઇટની સૂચિ સાથે ચેક કરે છે. જો કોઈ સાઇટ તમારો પાસવર્ડ ચોરી કરવાનો પ્રયાસ કરે અથવા તમે કોઈ નુકસાનકારક ફાઇલ ડાઉનલોડ કરો, ત્યારે Chromium પેજ કન્ટેન્ટના બિટની સાથોસાથ URLs પણ Safe Browsingને મોકલી શકે છે. અહીંથી તમારા Android ફોન પર નંબર મોકલવા માટે, બન્ને ડિવાઇસ પર Chromiumમાં સાઇન ઇન કરો. જ્યારે તમે Chromium શરૂ કરો છો ત્યારે જે પેજ દર્શાવવામાં આવે છે તે આ એક્સટેન્શને બદલ્યું છે. +આગળ વધો જ્યારે તમે Chromium શરૂ કરો છો ત્યારે જે પેજ દર્શાવવામાં આવે છે તે એક્સટેન્શને બદલ્યું છે. આ સાઇટ માટે Chromiumને કૅમેરા અને માઇક્રોફોનની પરવાનગીઓની જરૂર છે Chromium માં @@ -112,6 +113,7 @@ છતાં પણ Chromiumમાંથી બહાર નિકળવું છે? Chromiumને બૅકગ્રાઉન્ડમાં ચાલવા દો Chromium ને કસ્ટમાઇઝ અને નિયંત્રિત કરો +વધારેલી સુરક્ષા ફિશિંગ અને માલવેરને બ્લૉક કરવામાં વધુ સહાયરૂપ થાય છે Chromium પર આપનું સ્વાગત છે; નવી બ્રાઉઝર વિન્ડો ખોલી છે કંઈક ખોટુ થયું હોવાને કારણે Chromium અપડેટ થયું નથી. Chromium અપડેટ કરવામાં આવતી સમસ્યાઓ અને નિષ્ફળ થયેલા અપડેટ સુધારો. નવી Chromium પ્રોફાઇલમાં બ્રાઉઝિંગ ચાલુ રાખીએ? diff --git a/chrome/app/resources/chromium_strings_hi.xtb b/chrome/app/resources/chromium_strings_hi.xtb index 96abf074770f50..1c9b8a3d82d782 100644 --- a/chrome/app/resources/chromium_strings_hi.xtb +++ b/chrome/app/resources/chromium_strings_hi.xtb @@ -34,6 +34,7 @@ Chromium में पहले से सेव असुरक्षित साइटों की सूची का इस्तेमाल करके, यूआरएल की जांच करता है. अगर कोई साइट आपका पासवर्ड चुराने की कोशिश करती है या नुकसान पहुंचाने वाली कोई फ़ाइल डाउनलोड होने पर Chromium, सुरक्षित ब्राउज़िंग की सेवा को उनका यूआरएल भेजता है. यूआरएल के साथ-साथ पेज का कुछ कॉन्टेंट भी भेजा जाता है. यहां से अपने Android फ़ोन पर नंबर भेजने के लिए, दोनों डिवाइस पर क्रोमियम में साइन इन करें. इस एक्सटेंशन ने यह बदल दिया है कि जब आप क्रोमियम प्रारंभ करते हैं तब कौन सा पृष्‍ठ दिखाया जाए. +जारी रखें एक्सटेंशन "" ने यह बदल दिया है कि जब आप क्रोमियम प्रारंभ करते हैं तब कौन सा पृष्‍ठ दिखाया जाए. Chromium को इस साइट के लिए, माइक्रोफ़ोन और कैमरा ऐक्सेस करने की अनुमति चाहिए क्रोमियम में @@ -110,6 +111,7 @@ फिर भी क्रोमियम से बाहर निकलें? क्रोमियम को बैकग्राउंड में चलने दें क्रोमियम को पसंद के मुताबिक बनाएं और नियंत्रित करें +बेहतर सुरक्षा की मदद से फ़िशिंग और मैलवेयर को बेहतर तरीके से ब्लॉक किया जाता है Chromium में आपका स्वागत है; नई ब्राउज़र विंडो खोली गई किसी गड़बड़ी की वजह से क्रोमियम अपडेट नहीं हुआ. क्रोमियम को अपडेट करने से जुड़ी समस्याएं और नहीं हो पाने वाले अपडेट ठीक करें. क्या आप नए Chromium प्रोफ़ाइल में ब्राउज़िंग जारी रखना चाहते हैं? diff --git a/chrome/app/resources/chromium_strings_hr.xtb b/chrome/app/resources/chromium_strings_hr.xtb index 8abdbb23b33bdb..23351af4031868 100644 --- a/chrome/app/resources/chromium_strings_hr.xtb +++ b/chrome/app/resources/chromium_strings_hr.xtb @@ -34,6 +34,7 @@ Provjerava URL-ove s popisom nesigurnih web-lokacija pohranjenih u Chromiumu. Ako neka web-lokacija pokuša ukrasti vašu zaporku ili ako preuzmete štetnu datoteku, Chromium također može sigurnom pregledavanju poslati URL-ove, uključujući dijelove sadržaja web-stranice. Da biste poslali broj s ovog uređaja na svoj Android telefon, prijavite se na Chromium na oba uređaja. Ovo proširenje promijenilo je stranicu koja se prikazuje prilikom pokretanja Chromiuma. +Nastavi Proširenje "" promijenilo je stranicu koja se prikazuje prilikom pokretanja Chromiuma. Chromium treba dopuštenje za fotoaparat i mikrofon za ovu web-lokaciju U Chromiumu @@ -110,6 +111,7 @@ Želite li ipak zatvoriti Chromium? Neka Chromium radi u pozadini Prilagodite Chromium i upravljajte njime +Poboljšana zaštita blokira krađu identiteta i zlonamjerni softver na više načina Dobro došli u Chromium; otvorio se novi prozor preglednika Chromium se nije ažurirao zbog pogreške. Riješite probleme s ažuriranjem i neuspjela ažuriranja Chromiuma. Želite li nastaviti na novom profilu u Chromiumu? diff --git a/chrome/app/resources/chromium_strings_hu.xtb b/chrome/app/resources/chromium_strings_hu.xtb index d6c8498a6f638e..f6796c1a76a5dd 100644 --- a/chrome/app/resources/chromium_strings_hu.xtb +++ b/chrome/app/resources/chromium_strings_hu.xtb @@ -34,6 +34,7 @@ Ellenőrzi az URL-eket a Chromiumban a nem biztonságos webhelyekről tárolt lista alapján. Ha valamelyik webhely megpróbálja ellopni az Ön jelszavát, illetve ha Ön kártékony fájlt tölt le, akkor a Chromium elküldheti az URL-eket is (az oldal tartalmának részeivel együtt) a Biztonságos Böngészésnek. Ha innen szeretne számot küldeni Android-telefonjára, jelentkezzen be a Chromiumba mindkét eszközén. Ez a bővítmény módosította, hogy melyik oldal jelenjen meg a Chromium indításakor. +Tovább A(z) bővítmény módosította, hogy melyik oldal jelenjen meg a Chromium indításakor. A Chromiumnak kamera- és mikrofonhasználati engedélyre van szüksége ehhez a webhelyhez A Chromiumban @@ -110,6 +111,7 @@ Biztosan kilép a Chromiumból? A Chromium futhat a háttérben A Chromium személyre szabása és beállításai +A Speciális védelem még többet tesz annak érdekében, hogy letiltsa az adathalászatot és a rosszindulatú programokat Üdvözöljük a Chromiumban; új böngészőablak megnyitva Ismeretlen hiba történt, ezért a Chromium nem frissült. A Chromium frissítési problémáinak megoldása. Biztosan új Chromium-profilban folytatja? diff --git a/chrome/app/resources/chromium_strings_hy.xtb b/chrome/app/resources/chromium_strings_hy.xtb index a2bb741f03378a..62c5b3df3a8def 100644 --- a/chrome/app/resources/chromium_strings_hy.xtb +++ b/chrome/app/resources/chromium_strings_hy.xtb @@ -36,6 +36,7 @@ Ստուգում է URL-ները Chromium-ում պահված վտանգավոր կայքերի ցանկի միջոցով։ Եթե կայքը փորձում է գողանալ ձեր գաղտնաբառը, կամ երբ վնասակար ֆայլ եք ներբեռնում, Chromium-ը կարող է ուղարկել URL-ն ու էջի բովանդակությունը՝ անվտանգ դիտարկման միջոցով ստուգելու համար։ Հեռախոսահամարն այստեղից ձեր Android հեռախոսին ուղարկելու համար երկու սարքերի Chromium դիտարկիչներում մտեք հաշիվ։ Այս ընդլայնումը փոխել է Chromium-ի մեկնարկի ժամանակ ցուցադրվող էջը: +Շարունակել «» ընդլայնումը փոխել է Chromium-ի մեկնարկի ժամանակ ցուցադրվող էջը: Այս կայքի համար Chromium-ին անհրաժեշտ է խոսափողն ու տեսախցիկն օգտագործելու թույլտվություն Chromium-ի մեջ @@ -112,6 +113,7 @@ Փակե՞լ Chromium-ը։ Թույլատրել Chromium-ին աշխատել ֆոնային ռեժիմում Հարմարեցնել և վերահսկել Chromium-ը +Լրացուցիչ պաշտպանությունն օգնում է խուսափել ֆիշինգից և արգելափակել վնասաբեր ծրագրերը Բարի գալուստ Chromium․ բացված է դիտարկիչի նոր պատուհան Անհայտ սխալի պատճառով չհաջողվեց թարմացնել Chromium-ը։ Շտկել Chromium-ի թարմացման հետ կապված խնդիրները Շարունակե՞լ Chromium-ի նոր պրոֆիլով diff --git a/chrome/app/resources/chromium_strings_id.xtb b/chrome/app/resources/chromium_strings_id.xtb index 3f8abe8ce64de0..aa7d9e89158c1c 100644 --- a/chrome/app/resources/chromium_strings_id.xtb +++ b/chrome/app/resources/chromium_strings_id.xtb @@ -34,6 +34,7 @@ Memeriksa kesesuaian URL dengan daftar situs tidak aman yang disimpan di Chromium. Jika situs berusaha mencuri sandi Anda, atau jika Anda mendownload file berbahaya, Chromium mungkin juga mengirim URL, termasuk bit konten halaman, ke Safe Browsing. Untuk mengirimkan nomor dari sini ke ponsel Android Anda, login ke Chromium di kedua perangkat. Ekstensi ini telah mengubah apa yang ditampilkan oleh halaman saat Anda memulai Chromium. +Lanjutkan Ekstensi "" telah mengubah apa yang ditampilkan oleh halaman saat Anda memulai Chromium. Chromium memerlukan izin mikrofon dan kamera untuk situs ini Di Chromium @@ -110,6 +111,7 @@ Tetap keluar dari Chromium? Jalankan Chromium di Background Menyesuaikan dan mengontrol Chromium +Perlindungan yang ditingkatkan akan memblokir phishing dan malware dengan lebih optimal Selamat datang di Chromium; jendela browser baru terbuka Chromium tidak dapat diupdate, terjadi error. Perbaiki masalah update Chrome dan update yang gagal. Lanjutkan di profil Chromium baru? diff --git a/chrome/app/resources/chromium_strings_is.xtb b/chrome/app/resources/chromium_strings_is.xtb index 9d41f52a962e42..5e86a3bc3c5424 100644 --- a/chrome/app/resources/chromium_strings_is.xtb +++ b/chrome/app/resources/chromium_strings_is.xtb @@ -36,6 +36,7 @@ Sumir eiginleikar kunna að vera óaðgengilegir og breytingar á kjörstillingu Ber vefslóðir saman við lista yfir óörugg vefsvæði sem er vistaður í Chromium. Ef vefsvæði reynir að stela aðgangsorðinu þínu, eða ef þú sækir skaðlega skrá, gæti Chromium einnig sent vefslóðir í Örugga vefskoðun, þar á meðal hluta af innihaldi síðna. Til að senda númer héðan í Android símann þinn skaltu skrá þig inn á Chromium í báðum tækjunum. Þessi viðbót hefur breytt því hvaða síða birtist þegar þú ræsir Chromium. +Halda áfram Viðbótin „“ hefur breytt því hvaða síða birtist þegar þú ræsir Chromium. Chromium verður að fá leyfi fyrir myndavél og hljóðnema fyrir þetta vefsvæði í Chromium @@ -112,6 +113,7 @@ Sumir eiginleikar kunna að vera óaðgengilegir og breytingar á kjörstillingu Viltu samt loka Chromium? Leyfa Chromium að keyra í bakgrunni Sérsníða og stjórna Chromium +Aukin vernd gengur lengra í að loka á vefveiðar og spilliforrit Velkomin(n) í Chromium; nýr vafragluggi opnaður Chromium uppfærðist ekki þar sem eitthvað fór úrskeiðis. Lagaðu uppfærsluvandamál Chromium og uppfærslur sem mistókust. Halda áfram á nýjum Chromium prófíl? diff --git a/chrome/app/resources/chromium_strings_it.xtb b/chrome/app/resources/chromium_strings_it.xtb index 37e08fa971cc40..847762b0c8a226 100644 --- a/chrome/app/resources/chromium_strings_it.xtb +++ b/chrome/app/resources/chromium_strings_it.xtb @@ -34,6 +34,7 @@ Controlla gli URL confrontandoli con un elenco di siti non sicuri memorizzato in Chromium. Se un sito cerca di rubare la tua password o se scarichi un file dannoso, Chromium potrebbe anche inviare gli URL, inclusi frammenti dei contenuti delle pagine, a Navigazione sicura. Per inviare un numero da questo dispositivo al tuo telefono Android, accedi a Chromium su entrambi i dispositivi. Questa estensione ha cambiato la pagina mostrata all'avvio di Chromium. +Continua L'estensione "" ha cambiato la pagina mostrata all'avvio di Chromium. Chromium deve avere le autorizzazioni di accesso al microfono e alla fotocamera per questo sito In Chromium @@ -110,6 +111,7 @@ Vuoi uscire comunque da Chromium? Lascia Chromium in esecuzione in background Personalizza e controlla Chromium +La protezione avanzata blocca malware e tentativi di phishing con maggiore efficacia Ti diamo il benvenuto in Chromium; nuova finestra del browser aperta Si è verificato un errore: Chromium non si è aggiornato. Risolvi i problemi di aggiornamento e gli aggiornamenti non riusciti di Chromium. Vuoi continuare con un nuovo profilo Chromium? diff --git a/chrome/app/resources/chromium_strings_iw.xtb b/chrome/app/resources/chromium_strings_iw.xtb index e18892ea78a4a2..8cec5a12af063d 100644 --- a/chrome/app/resources/chromium_strings_iw.xtb +++ b/chrome/app/resources/chromium_strings_iw.xtb @@ -34,6 +34,7 @@ ‏המערכת בודקת כתובות URL בעזרת רשימה של אתרים לא בטוחים ששמורה ב-Chromium. אם באתר כלשהו מתבצע ניסיון לגנוב את הסיסמה שלך, או אם המערכת מזהה הורדה של קובץ מזיק, Chromium עשוי גם לשלוח כתובות URL לבדיקה באמצעות 'גלישה בטוחה'. הנתונים שנשלחים לבדיקה כוללים ביטים מתוכן של דפים. ‏כדי לשלוח מספר מכאן לטלפון Android, יש להיכנס ל-Chromium בשני המכשירים. ‏התוסף שינה את הדף שמוצג כשמפעילים את Chromium. +המשך ‏התוסף "" שינה את הדף שמוצג כשמפעילים את Chromium. ‏נדרשות הרשאות גישה למצלמה ולמיקרופון ב-Chromium עבור האתר הזה ‏ב-Chromium @@ -108,6 +109,7 @@ ‏לסגור את Chromium בכל זאת? ‏Chromium יכול לפעול ברקע ‏התאמה אישית ושליטה ב-Chromium +עם ההגנה המשופרת, החסימה של פישינג ותוכנות זדוניות מקיפה יותר ‏ברוך בואך אל Chromium. נפתח חלון חדש בדפדפן ‏Chromium לא התעדכן, משהו השתבש. לטיפול בבעיות בעדכון של Chromium ובעדכונים שנכשלו ‏להמשיך בפרופיל Chromium חדש? diff --git a/chrome/app/resources/chromium_strings_ja.xtb b/chrome/app/resources/chromium_strings_ja.xtb index c74af2933e4679..2bdcf177fc4130 100644 --- a/chrome/app/resources/chromium_strings_ja.xtb +++ b/chrome/app/resources/chromium_strings_ja.xtb @@ -34,6 +34,7 @@ Chromium に保存されている安全でないサイトのリストと URL を照合します。サイトがパスワードを不正に取得しようとしている場合や、ユーザーが安全でないファイルをダウンロードしようとした場合は、URL とページ コンテンツの一部をセーフ ブラウジングに送信することがあります。 Android スマートフォンに番号を送信するには、両方のデバイスで Chromium にログインしてください。 この拡張機能により、Chromium の起動時に表示されるページが変更されました。 +続行 拡張機能「」により、Chromium の起動時に表示されるページが変更されました。 このサイトを利用するには、Chromium でカメラとマイクの使用を許可する必要があります Chromium 内 @@ -110,6 +111,7 @@ 今すぐ Chromium を終了しますか? Chromium をバックグラウンドで実行する Chromium の設定 +保護強化機能により、フィッシングを防ぎ、不正なソフトウェアをより強力にブロックします Chromium へようこそ。新しいブラウザ ウィンドウが開いています エラーが発生したため、Chromium が更新されませんでした。Chromium の更新に関する問題を解決してください。 新しい Chromium プロフィールで続行しますか? diff --git a/chrome/app/resources/chromium_strings_ka.xtb b/chrome/app/resources/chromium_strings_ka.xtb index e85954895dd089..d3e5dde92e5037 100644 --- a/chrome/app/resources/chromium_strings_ka.xtb +++ b/chrome/app/resources/chromium_strings_ka.xtb @@ -36,6 +36,7 @@ შეამოწმებს URL-ების თანხვედრას Chromium-ში შენახულ არაუსაფრთხო საიტების სიასთან. საიტის მიერ პაროლის მოპარვის მცდელობის ან თქვენ მიერ საზიანო ფაილის ჩამოტვირთვის შემთხვევაში Chromium-ის მიერ Safe Browsing-ს გაეგზავნება URL-ები და შესაბამისი გვერდის კონტენტის გარკვეული ნაწილი. აქედან თქვენს Android ტელეფონზე ნომრის გასაგზავნად შედით Chromium-ში ორივე მოწყობილობაზე. ამ გაფართოებამ თქვენ მიერ Chromium-ის გაშვებისას ნაჩვენები გვერდი შეცვალა. +გაგრძელება გაფართოებამ „“ თქვენ მიერ Chromium-ის გაშვებისას ნაჩვენები გვერდი შეცვალა. Chromium საჭიროებს კამერისა და მიკროფონზე წვდომის ნებართვას ამ საიტისთვის Chromium-ში @@ -112,6 +113,7 @@ მაინც გსურთ Chromium-იდან გასვლა? Chromium-ისთვის ფონურ რეჟიმში მუშაობის დაშვება Chromium-ის მორგება და კონტროლი +გაძლიერებული დაცვა გთავაზობთ ფიშინგისა და მავნე პროგრამებისგან დაცვის მეტ საშუალებას მოგესალმებით Chromium-ში; გახსნილია ბრაუზერის ახალი ფანჯარა Chromium-ის განახლება ვერ მოხერხდა შეფერხების გამო. შეასწორეთ Chromium-ის განახლებასთან დაკავშირებული პრობლემები და განუხორციელებელი განახლებები. გსურთ ახალ Chromium პროფილში გაგრძელება? diff --git a/chrome/app/resources/chromium_strings_kk.xtb b/chrome/app/resources/chromium_strings_kk.xtb index d2f35e51ddbc30..57fa74b1f4e9e2 100644 --- a/chrome/app/resources/chromium_strings_kk.xtb +++ b/chrome/app/resources/chromium_strings_kk.xtb @@ -36,6 +36,7 @@ URL мекенжайларын Chromium браузерінде сақталған қауіпсіз емес сайттар тізімімен салыстырып тексереді. Егер сайт құпия сөзіңізді ұрлағысы келсе немесе зиянды файлды жүктеп алсаңыз, Chromium браузері URL мекенжайларын, сондай-ақ бет мазмұны бөліктерін Safe Browsing қызметіне жіберуі мүмкін. Нөмірді осы жерден Android телефонына жіберу үшін екі құрылғыда да Chromium браузеріне кіріңіз. Бұл кеңейтім Chromium браузерін іске қосқан кезде көрсетілетін бетті өзгертті. +Жалғастыру «» кеңейтімі Chromium браузерін іске қосқан кезде көрсетілетін бетті өзгертті. Chromium бұл сайт үшін камера мен микрофонды пайдалануға рұқсат сұрайды. Chromium аясында @@ -112,6 +113,7 @@ Chromium браузерінен бәрібір шығасыз ба? Chromium браузеріне фондық режимде жұмыс істеуге рұқсат беру Chromium реттеу және басқару +Жақсартылған қорғаныс фишинг пен зиянды бағдарламаларды бөгеуде көбірек істейді. Chromium браузеріне қош келдіңіз! Жаңа браузер терезесі ашылды. Chromium жаңартылған жоқ. Бірдеңе дұрыс болмады. Chromium браузеріндегі жаңартуға қатысты мәселелерді түзетіңіз. Жаңа Chromium профилінде жалғастырылсын ба? diff --git a/chrome/app/resources/chromium_strings_km.xtb b/chrome/app/resources/chromium_strings_km.xtb index 2a44d42ac66e23..570b8efcd8f46c 100644 --- a/chrome/app/resources/chromium_strings_km.xtb +++ b/chrome/app/resources/chromium_strings_km.xtb @@ -36,6 +36,7 @@ ពិនិត្យ URL ធៀបនឹងបញ្ជីគេហទំព័រគ្មានសុវត្ថិភាព ដែលរក្សាទុកនៅក្នុង Chromium។ ប្រសិនបើ​គេហទំព័រណាមួយ​ព្យាយាមលួចពាក្យសម្ងាត់​របស់អ្នក ឬនៅពេលអ្នក​ទាញយក​ឯកសារដែលបង្កគ្រោះថ្នាក់នោះ Chromium ក៏ប្រហែលជាបញ្ជូន URL រួមជាមួយផ្នែកនៃខ្លឹមសារទំព័រ ទៅការរុករកដោយសុវត្ថិភាពផងដែរ។ ដើម្បីផ្ញើលេខទូរសព្ទ​ពីទីនេះទៅទូរសព្ទ Android របស់អ្នក សូមចូល Chromium នៅលើ​ឧបករណ៍​ទាំងពីរ។ កម្មវិធីបន្ថែមនេះបានប្តូរអ្វីដែលបានបង្ហាញនៅលើទំព័រនៅពេលអ្នកចាប់ផ្តើម Chromium។ +បន្ត កម្មវិធីបន្ថែម "" បានប្តូរអ្វីដែលបានបង្ហាញនៅលើទំព័រនៅពេលអ្នកចាប់ផ្តើម Chromium។ Chromium ត្រូវការ​ការអនុញ្ញាត​មីក្រូហ្វូន និង​កាមេរ៉ា​សម្រាប់គេហទំព័រនេះ នៅក្នុង Chromium @@ -111,8 +112,10 @@ ទទួលយកជំនួយពី Chromium ការតំឡើងបានបរាជ័យដោយសារកំហុសឆ្គងដែលមិនជាក់លាក់។ ប្រសិនបើ Chromium កំពុងដំណើរការនៅពេលបច្ចុប្បន្ន សូមបិទវាហើយព្យាយាមម្តងទៀត។ នៅ​តែចង់​ចាក​ចេញពី Chromium ឬ? +ប្ដូរតាមបំណងនូវ​ជម្រើសឯកជនភាព​ដែល Chromium គិតថា​សំខាន់បំផុត។ ការណែនាំនេះ​មិនរាប់បញ្ចូល​គ្រប់ជម្រើស និងការកំណត់​នោះទេ។ អនុញ្ញាត​ឱ្យ Chromium ដំណើរការ​នៅ​ផ្ទៃខាងក្រោយ កែសម្រួល និងគ្រប់គ្រង Chromium +ការការពារ​ដែលប្រសើរជាងមុនធ្វើសកម្មភាពសកម្មជាងមុន ដើម្បីទប់ស្កាត់ការដាក់នុយ និងកម្មវិធីគ្រោះថ្នាក់ សូម​ស្វាគមន៍​មក​កាន់ Chromium។ បាន​បើក​វិនដូ​របស់​កម្មវិធីរុករកតាមអ៊ីនធឺណិត​ថ្មី Chromium មិន​បានដំឡើងកំណែទេ មានអ្វីមួយខុសប្រក្រតី។ សូមដោះស្រាយបញ្ហា​នៃការដំឡើងកំណែ Chromium និងការដំឡើងកំណែដែលមិនបានសម្រេចផ្សេងៗ។ បន្តនៅក្នុងកម្រងព័ត៌មាន Chromium ថ្មីឬ? @@ -297,5 +300,6 @@ Chromium មិនអាចសង្គ្រោះការកំណត់រ ប្រព័ន្ធ Chromium OS Chromium អាច​នឹង​​ដំណើរការ​មិន​​ត្រឹមត្រូវ​ ដោយសារ​វា​មិន​អាចប្រើ​បាន​នៅលើ Windows XP ឬ Windows Vista ទៀត​ឡើយ។ តើនរណា​កំពុងប្រើ Chromium? +ទទួលបាន​សុវត្ថិភាពខ្លាំង​បំផុតរបស់ Chromium ផលិតករ Chromium \ No newline at end of file diff --git a/chrome/app/resources/chromium_strings_kn.xtb b/chrome/app/resources/chromium_strings_kn.xtb index ba657726aae0bd..173e76ef6778f5 100644 --- a/chrome/app/resources/chromium_strings_kn.xtb +++ b/chrome/app/resources/chromium_strings_kn.xtb @@ -34,6 +34,7 @@ Chromium ನಲ್ಲಿ ಸಂಗ್ರಹಣೆ ಮಾಡಲಾಗಿರುವ ಅಸುರಕ್ಷಿತ ಸೈಟ್‌ಗಳ ಪಟ್ಟಿಯನ್ನು ಬಳಸಿ, URL ಗಳನ್ನು ಪರಿಶೀಲಿಸುತ್ತದೆ. ಯಾವುದಾದರೂ ಸೈಟ್, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಕದಿಯಲು ಪ್ರಯತ್ನಿಸಿದರೆ ಅಥವಾ ನೀವು ಹಾನಿಕಾರಕ ಫೈಲ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದಾಗ, ಪುಟದ ಕಂಟೆಂಟ್‌ನ ತುಣುಕುಗಳನ್ನು ಒಳಗೊಂಡ URL ಗಳನ್ನು ಸಹ Chromium, ಸುರಕ್ಷಿತ ಬ್ರೌಸಿಂಗ್‌ಗೆ ಕಳುಹಿಸಬಹುದು. ಇಲ್ಲಿಂದ ನಿಮ್ಮ Android ಫೋನ್‌ಗೆ ಸಂಖ್ಯೆಯನ್ನು ಕಳುಹಿಸಲು, ಎರಡೂ ಸಾಧನಗಳಲ್ಲಿ Chromium ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ. ನೀವು Chromium ಪ್ರಾರಂಭಿಸಿದಾಗ ಯಾವ ಪುಟ ತೋರಿಸಬೇಕೆಂಬುದನ್ನು ಈ ವಿಸ್ತರಣೆಯು ಬದಲಾಯಿಸಿದೆ. +ಮುಂದುವರೆಸಿ ನೀವು Chromium ಪ್ರಾರಂಭಿಸಿದಾಗ ತೋರಿಸಬೇಕಾದ ಪುಟವನ್ನು "" ವಿಸ್ತರಣೆಯು ಬದಲಾಯಿಸಿದೆ. ಈ ಸೈಟ್‌ಗೆ ಸಂಬಂಧಿಸಿದಂತೆ Chromium ಗೆ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೊಫೋನ್ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿದೆ Chromium ನಲ್ಲಿ @@ -108,6 +109,7 @@ ಹೇಗಿದ್ದರೂ Chromium ನಿಂದ ನಿರ್ಗಮಿಸುವುದೇ? Chromium ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅನುಮತಿಸಿ Chromium ಅನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ ಮತ್ತು ನಿಯಂತ್ರಿಸಿ +ಫಿಶಿಂಗ್ ಮತ್ತು ಮಾಲ್‌ವೇರ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು ವರ್ಧಿತ ಸುರಕ್ಷತೆ ಹೆಚ್ಚಿನ ಸಹಾಯ ಮಾಡುತ್ತದೆ Chromium ಗೆ ಸುಸ್ವಾಗತ; ಹೊಸ ಬ್ರೌಸರ್‌ನಲ್ಲಿ ಹೊಸ ವಿಂಡೋವನ್ನು ತೆರೆಯಲಾಗಿದೆ Chromium ಅಪ್‌ಡೇಟ್ ಆಗಲಿಲ್ಲ, ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ. Chromium ಅಪ್‌ಡೇಟ್ ಸಮಸ್ಯೆಗಳು ಹಾಗೂ ವಿಫಲವಾದ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಸರಿಪಡಿಸಿ. ಹೊಸ Chromium ಪ್ರೊಫೈಲ್‌ನಲ್ಲಿ ಮುಂದುವರಿಯಬೇಕೆ? diff --git a/chrome/app/resources/chromium_strings_ko.xtb b/chrome/app/resources/chromium_strings_ko.xtb index 68cc4bbe8b5464..8d872b1de3e8eb 100644 --- a/chrome/app/resources/chromium_strings_ko.xtb +++ b/chrome/app/resources/chromium_strings_ko.xtb @@ -36,6 +36,7 @@ Chromium에 저장된 안전하지 않은 사이트 목록을 사용하여 URL을 검사합니다. 사이트에서 사용자의 비밀번호를 도용하려고 하거나 사용자가 유해한 파일을 다운로드하는 경우, Chromium에서 페이지 콘텐츠 일부를 비롯한 URL을 세이프 브라우징 서비스에 보낼 수 있습니다. 여기에서 Android 휴대전화로 번호를 전송하려면 두 기기 모두에서 Chromium에 로그인하세요. Chromium을 시작하면 표시되는 페이지가 이 확장 프로그램으로 인해 변경되었습니다. +계속 Chromium을 시작하면 표시되는 페이지가 '' 확장 프로그램으로 인해 변경되었습니다. Chromium에서 사이트에 대한 카메라 및 마이크 권한이 필요합니다. Chromium에서 @@ -112,6 +113,7 @@ Chromium을 종료하시겠습니까? 백그라운드에서 Chromium을 실행 Chromium 맞춤설정 및 제어 +향상된 보호 기능이 피싱 및 멀웨어를 더욱 효과적으로 차단합니다. Chromium에 오신 것을 환영합니다. 새 브라우저 창이 열렸습니다 문제가 발생하여 Chromium을 업데이트할 수 없습니다. Chromium 업데이트 문제 및 업데이트 실패 문제 해결하기 새 Chromium 프로필로 계속하시겠습니까? diff --git a/chrome/app/resources/chromium_strings_ky.xtb b/chrome/app/resources/chromium_strings_ky.xtb index a2ce377aca2124..01683ac7952572 100644 --- a/chrome/app/resources/chromium_strings_ky.xtb +++ b/chrome/app/resources/chromium_strings_ky.xtb @@ -36,6 +36,7 @@ Chromium'дагы кооптуу сайттардын тизмесиндеги URL даректерин текшерет. Эгер сайт сырсөзүңүздү уурдоого аракет кылса же кооптуу файлды жүктөп алсаңыз, Chromium URL даректерди, анын ичинде барактардагы мазмунду Коопсуз серептөөгө жөнөтүшү мүмкүн. Номерди бул жерден Android телефонуңузга жөнөтүү үчүн эки түзмөгүңүздөн тең Chromium'га кириңиз. Бул кеңейтүү Chromium иштеп баштаганда көрсөтүлө турган бетти өзгөрттү. +Улантуу "" кеңейтүүсү Chromium иштеп баштаганда көрсөтүлө турган бетти өзгөрттү. Chromium'га бул сайтта камера менен микрофонду колдонууга уруксат бериңиз Chromium'да @@ -112,6 +113,7 @@ Баары бир Chromium'дан чыгасызбы? Chromium'га фондук режимде иштөөгө уруксат берүү Chromium'ду өзгөчөлөштүрүү жана көзөмөлдөө +Өркүндөтүлгөн коргоо параметри фишинг жана кесепеттүү программалардан жакшыраак коргойт Chromium'га кош келиңиз; серепчиде жаңы терезе ачылды Chromium жаңырган жок. Бир жерден ката кетти. Chrome'догу жаңыртуу маселелерин оңдоңуз. Жаңы Chromium профилинде улантасызбы? diff --git a/chrome/app/resources/chromium_strings_lo.xtb b/chrome/app/resources/chromium_strings_lo.xtb index 3fd19aa6fed364..6fc81b03ad3cd6 100644 --- a/chrome/app/resources/chromium_strings_lo.xtb +++ b/chrome/app/resources/chromium_strings_lo.xtb @@ -36,6 +36,7 @@ ກວດສອບ URL ກັບລາຍຊື່ເວັບໄຊທີ່ບໍ່ປອດໄພທີ່ຈັດເກັບໄວ້ໃນ Chromium. ຖ້າມີເວັບໄຊໃດໜຶ່ງພະຍາຍາມລັກເອົາລະຫັດຜ່ານຂອງທ່ານ ຫຼື ເມື່ອທ່ານດາວໂຫຼດໄຟລ໌ອັນຕະລາຍ, Chromium ອາດສົ່ງ URL, ຮວມທັງເນື້ອຫາບາງສ່ວນຂອງໜ້າໄປໃຫ້ Safe Browsing. ເພື່ອສົ່ງເບີຈາກບ່ອນນີ້ໃຫ້ໂທລະສັບ Android ຂອງທ່ານ, ກະລຸນາເຂົ້າສູ່ລະບົບ Chromium ຢູ່ໃນທັງສອງອຸປະກອນ. ສ່ວນຂະຫຍາຍ​ນີ້​ໄດ້ປ່ຽນສິ່ງທີ່ໜ້າສະແດງຂຶ້ນ ເມື່ອທ່ານເລີ່ມຕົ້ນ Chromium​. +ສືບຕໍ່ ສ່ວນຂະຫຍາຍ "" ໄດ້ປ່ຽນສິ່ງທີ່ໜ້າສະແດງຂຶ້ນ ເມື່ອທ່ານເລີ່ມຕົ້ນ Chromium​. Chromium ຕ້ອງການການອະນຸຍາດກ້ອງຖ່າຍຮູບ ແລະ ໄມໂຄຣໂຟນສຳລັບເວັບໄຊນີ້ ໃນ Chromium @@ -112,6 +113,7 @@ ຢືນຢັນການອອກຈາກ Chromium ບໍ? ໃຫ້ Chromium ເປີດໃຊ້ຢູ່ໃນພື້ນຫຼັງ ກໍານົດໃຊ້ ແລະ​ຄວບ​ຄຸມ Chromium +ການປົກປ້ອງທີ່ປັບປຸງດີຂຶ້ນເຮັດໄດ້ຫຼາຍກວ່າໃນການບລັອກການຫຼອກເອົາຂໍ້ມູນ ແລະ ເມົາແວ ຍິນດີຕ້ອນຮັບສູ່ Chromium; ເປີດໜ້າຈໍໂປຣແກຣມທ່ອງເວັບໃໝ່ແລ້ວ Chromium ບໍ່ອັບເດດ, ມີບາງຢ່າງຜິດພາດ. ແກ້ໄຂບັນຫາການອັບເດດ Chromium ແລະ ການອັບເດດທີ່ບໍ່ສຳເລັດ. ສືບຕໍ່ໃນໂປຣໄຟລ໌ Chromium ໃໝ່ບໍ? diff --git a/chrome/app/resources/chromium_strings_lt.xtb b/chrome/app/resources/chromium_strings_lt.xtb index 2336bb03c2d3b2..69fb971b3d3ebd 100644 --- a/chrome/app/resources/chromium_strings_lt.xtb +++ b/chrome/app/resources/chromium_strings_lt.xtb @@ -36,6 +36,7 @@ Kai kurios funkcijos gali būti nepasiekiamos ir nuostatų pakeitimai nebus išs Tikrinami URL pagal nesaugių svetainių sąrašą, saugomą naršyklėje „Chromium“. Jei svetainė bando pavogti slaptažodį ar atsisiuntėte žalingą failą, „Chromium“ taip pat gali siųsti URL, įskaitant puslapio turinio dalis, Saugaus naršymo funkcijai. Jei norite iš čia į „Android“ telefoną išsiųsti numerį, prisijunkite prie „Chromium“ abiejuose įrenginiuose. Šis plėtinys pakeitė, kuris puslapis rodomas paleidus „Chromium“. +Tęskite Plėtinys „“ pakeitė, kuris puslapis rodomas paleidus „Chromium“. „Chromium“ reikalingi fotoaparato ir mikrofono leidimai šioje svetainėje Naudojant „Chromium“ @@ -112,6 +113,7 @@ Kai kurios funkcijos gali būti nepasiekiamos ir nuostatų pakeitimai nebus išs Vis tiek išeiti iš „Chromium“? „Chromium“ leidimas fone Tinkinkite ir valdykite „Chromium“ +Naudojant sustiprintą apsaugą pasitelkiama papildomų priemonių sukčiavimui ir kenkėjiškoms programoms užblokuoti Sveiki, tai – „Chromium“; atidarytas naujas naršyklės langas Nepavyko atnaujinti „Chromium“, įvyko klaida. Pašalinkite „Chromium“ naujinimo problemas ir naujinių klaidas. Tęsti naudojant naują „Chromium“ profilį? diff --git a/chrome/app/resources/chromium_strings_lv.xtb b/chrome/app/resources/chromium_strings_lv.xtb index 8d917b20832538..d7e2dcab4b5485 100644 --- a/chrome/app/resources/chromium_strings_lv.xtb +++ b/chrome/app/resources/chromium_strings_lv.xtb @@ -34,6 +34,7 @@ Vietrāži URL tiek pārbaudīti, salīdzinot ar nedrošo vietņu sarakstu, kas ir saglabāts pārlūkprogrammā Chromium. Ja kādā vietnē tiek mēģināts nozagt jūsu paroli vai ja jūs lejupielādējat kaitīgu failu, Chromium var arī nosūtīt attiecīgos URL, tostarp lapas satura fragmentus, uz funkciju Droša pārlūkošana. Lai nosūtītu numuru no šejienes uz savu Android tālruni, abās ierīcēs pierakstieties pārlūkā Chromium. Šis paplašinājums mainīja iestatījumu, kura lapa tiek parādīta, palaižot pārlūku Chromium. +Turpināt Paplašinājums “” mainīja iestatījumu, kura lapa tiek parādīta, palaižot pārlūku Chromium. Pārlūkam Chromium ir nepieciešama atļauja izmantot kameru un mikrofonu šajā vietnē. Pārlūkā Chromium @@ -110,6 +111,7 @@ Vai tik un tā aizvērt pārlūku Chromium? Ļaut pārlūkam Chromium darboties fonā Pielāgot un kontrolēt Chromium +Uzlabotā aizsardzība labāk bloķē pikšķerēšanas mēģinājumus un ļaunprātīgu programmatūru Laipni lūdzam pārlūkā Chromium (tika atvērts jauns pārlūka logs)! Pārlūkprogramma Chromium netika atjaunināta. Radās problēma. Novērsiet Chromium atjaunināšanas problēmas. Vai turpināt jaunā Chromium profilā? diff --git a/chrome/app/resources/chromium_strings_mk.xtb b/chrome/app/resources/chromium_strings_mk.xtb index 1391fe88c7ed55..4d8056de7fe561 100644 --- a/chrome/app/resources/chromium_strings_mk.xtb +++ b/chrome/app/resources/chromium_strings_mk.xtb @@ -36,6 +36,7 @@ Ги проверува URL-адресите во список со небезбедни сајтови меморирани во Chromium. Ако некој сајт се обиде да ви ја украде лозинката или кога ќе преземете штетна датотека, Chromium може да испрати и URL-адреси, вклучувајќи и делови од содржините на страницата, во „Безбедно прелистување“. За да испратите број оттука до телефонот со Android, најавете се на Chromium на двата уреда. Екстензијата ја смени страницата што се прикажува кога го стартувате Chromium. +Продолжи Екстензијата „“ ја смени страницата што се прикажува кога го стартувате Chromium. На Chromium му треба дозволи за камерата и микрофонот за сајтов Во Chromium @@ -112,6 +113,7 @@ Сепак да се излезе од Chromium? Остави го Chromium да работи во заднина Приспособи го и контролирај го Chromium +„Подобрената заштита“ помага при блокирање кражби на идентитетот и злонамерен софтвер Добре дојдовте на Chromium; отворен е нов прозорец во прелистувачот Chromium не се ажурираше, нешто тргна наопаку. Поправете ги проблемите со ажурирањето на Chromium и со неуспешните ажурирања. Сакате да продолжите на нов профил на Chromium? diff --git a/chrome/app/resources/chromium_strings_ml.xtb b/chrome/app/resources/chromium_strings_ml.xtb index b367110232dc59..9bf637d364de08 100644 --- a/chrome/app/resources/chromium_strings_ml.xtb +++ b/chrome/app/resources/chromium_strings_ml.xtb @@ -36,6 +36,7 @@ Chromium-ൽ സംഭരിച്ചിരിക്കുന്ന സുരക്ഷിതമല്ലാത്ത സൈറ്റുകളുടെ ലിസ്റ്റ് ഉപയോഗിച്ച് URL-കൾ പരിശോധിക്കുന്നു. ഒരു സൈറ്റ് നിങ്ങളുടെ പാസ്‌വേഡ് മോഷ്‌ടിക്കാൻ ശ്രമിക്കുമ്പോഴോ നിങ്ങൾ ഒരു ദോഷകരമായ ഫയൽ ഡൗൺലോഡ് ചെയ്യുമ്പോഴോ, പേജ് ഉള്ളടക്കത്തിന്റെ ബിറ്റുകൾ ഉൾപ്പെടെ URL-കൾ സുരക്ഷിത ബ്രൗസിംഗിലേക്ക് Chromium അയയ്ക്കുകയും ചെയ്തേക്കാം. ഇവിടെ നിന്ന് നിങ്ങളുടെ Android ഫോണിലേക്ക് ഒരു നമ്പർ അയയ്‌ക്കാൻ, രണ്ട് ഉപകരണങ്ങളിൽ നിന്നും Chromium-ൽ സൈൻ ഇൻ ചെയ്യുക. നിങ്ങൾ Chromium ആരംഭിക്കുമ്പോൾ ദൃശ്യമാകുന്ന പേജിനെ ഈ വിപുലീകരണം മാറ്റി. +തുടരുക നിങ്ങൾ Chromium ആരംഭിക്കുമ്പോൾ ദൃശ്യമാകുന്ന പേജിനെ "" വിപുലീകരണം മാറ്റി. Chromium-ന് ഈ സൈറ്റിനായി ക്യാമറ, മൈക്രോഫോൺ അനുമതികൾ ആവശ്യമാണ് Chromium-ത്തിൽ @@ -112,6 +113,7 @@ എന്തായാലും Chromium-ത്തിൽ നിന്ന് പുറത്തുകടക്കണോ? Chromium-ത്തെ പശ്ചാത്തലത്തിൽ പ്രവർത്തിക്കാൻ അനുവദിക്കുക Chromium ഇഷ്‌ടാനുസൃതമാക്കുക, നിയന്ത്രിക്കുക +ഫിഷിംഗും മാല്‍വെയറും ബ്ലോക്ക് ചെയ്യുന്നതിന് മെച്ചപ്പെടുത്തിയ പരിരക്ഷ കൂടുതൽ കാര്യങ്ങൾ ചെയ്യുന്നു Chromium-ലേക്ക് സ്വാഗതം; പുതിയ ബ്രൗസർ വിൻഡോ തുറന്നു Chromium അപ്‌ഡേറ്റ് ചെയ്തില്ല, എന്തോ കുഴപ്പമുണ്ടായി. Chromium അപ്‌ഡേറ്റ് സംബന്ധിച്ച പ്രശ്നങ്ങളും പരാജയപ്പെട്ട അപ്ഡേറ്റുകളും പരിഹരിക്കുക. പുതിയ Chromium പ്രൊഫൈലിൽ തുടരണോ? diff --git a/chrome/app/resources/chromium_strings_mn.xtb b/chrome/app/resources/chromium_strings_mn.xtb index aa7b703cfa1929..a5f5f2be1be8eb 100644 --- a/chrome/app/resources/chromium_strings_mn.xtb +++ b/chrome/app/resources/chromium_strings_mn.xtb @@ -36,6 +36,7 @@ URL-г Chromium-д хадгалсан аюултай сайтын жагсаалттай харьцуулж шалгадаг. Хэрэв сайт таны нууц үгийг хулгайлах гэж оролдвол эсвэл таныг аюултай файл татах үед Chromium нь хуудасны контентын зэрэг URL-г Аюулгүй хайлт руу мөн илгээж болзошгүй. Та эндээс Android утсандаа дугаар илгээхийн тулд хоёр төхөөрөмжийн аль алинаас нь Chromium-д нэвтэрнэ үү. Энэ өргөтгөл нь таныг Chromium эхлүүлэх үед хуудас дээр харуулах зүйлийг өөрчилсөн. +Цааш "" өргөтгөл нь таныг Chromium эхлүүлэх үед хуудасны харуулах зүйлийг өөрчилсөн. Chromium-д энэ сайтад зориулж камер болон микрофоны зөвшөөрөл шаардлагатай Chromium-д @@ -108,8 +109,10 @@ Chromium-с тусламж авах Гэнэтийн асуудлаас болж суулгах ажиллагаа амжилтгүй боллоо. Хэрвээ Chromium яг одоо ажиллаж байгаа бол хаагаад дахин оролдож үзнэ үү. Ямар ч байсан Chromium-с гарах уу? +Chromium-н хамгийн чухал гэж үздэг нууцлалын сонголтуудыг өөрчилнө үү. Энэ хөтчид бүх тохиргоо болон сонголт багтаагүй. Chromium-г цаана ажиллуулахыг зөвшөөрөх Chromium-ыг гүйцэтгэх ба хянах +Сайжруулсан хамгаалалт нь фишинг болон хортой кодыг блоклохын тулд илүү ихийг хийдэг Chromium-д тавтай морилно уу; хөтчийн шинэ цонхыг нээсэн Chromium-г шинэчлээгүй, ямар нэг алдаа гарлаа. Chromium-г шинэчлэхтэй холбоотой асуудлууд болон амжилтгүй болсон шинэчлэлтүүдийг засна уу. Chromium-н шинэ профайлд үргэлжлүүлэх үү? @@ -223,6 +226,7 @@ Шинэ цонх Таны веб хуудас, хавчуурга, болон бусад Chromium-ийн зүйлс энд байдаг. Таны системийн админ Chromium-г-д хандахын тулд -г нээхээр тохируулсан байна. +Мөн Chromium-д асаах уу? Та Chromium-н профайлуудаар Chromium-н бүх зүйлээ тусгаарлах боломжтой. Энэ нь ажил болон зугаацдаг зүйлсээ тусад нь байлгахад илүү хялбар болгоно. Chromium OS-г дахин эхлүүлэх - Chromium Дев @@ -292,5 +296,6 @@ Chromium үйлдлийн систем Windows XP болон Windows Vista нь цаашид Chromium-г дэмжихгүй тул буруу ажиллаж болзошгүй Chromium-г хэн ашиглаж байна вэ? +Chromium-н хамгийн хүчирхэг аюулгүй байдлыг аваарай Chromium-ыг бүтээгчид \ No newline at end of file diff --git a/chrome/app/resources/chromium_strings_mr.xtb b/chrome/app/resources/chromium_strings_mr.xtb index a2c03a9fa19a68..6f0fe7f51afbef 100644 --- a/chrome/app/resources/chromium_strings_mr.xtb +++ b/chrome/app/resources/chromium_strings_mr.xtb @@ -35,6 +35,7 @@ Chromium मध्ये स्टोअर केलेल्या असुरक्षित साइटच्या सूचीमध्ये URL तपासतो. एखाद्या साइटने तुमचा पासवर्ड चोरण्याचा प्रयत्न केल्यास किंवा तुम्ही हानीकारक फाइल डाउनलोड केल्यावर, Chromium हे पेजवरील काही आशयाच्या समावेशासह, URL सुरक्षित ब्राउझिंग कडे पाठवू शकते. येथून तुमच्या Android फोनवर नंबर पाठवण्यासाठी, दोन्ही डिव्हाइसवर Chromium मध्ये साइन इन करा. तुम्ही Chromium सुरू करता तेव्हा कोणते पेज दर्शविले जाते हे या एक्स्टेंशनने बदलले आहे. +सुरू ठेवा तुम्ही Chromium सुरू करता तेव्हा कोणते पेज दर्शविले जाते हे "" एक्स्टेंशनने बदलले आहे. Chromium ला या साइटसाठी कॅमेरा आणि मायक्रोफोनची परवानगी आवश्यक आहे Chromium मध्ये @@ -111,6 +112,7 @@ तरीही Chromium बंद करायचे? Chromium बॅकग्राउंडमध्ये सुरू द्या Chromium कस्टमाइझ करा आणि नियंत्रित करा +वर्धित सुरक्षितता फिशिंग आणि मालवेअर अधिक चांगल्यारितीने ब्लॉक करते Chromium मध्ये स्वागत आहे; नवीन ब्राउझर विंडो उघडली Chromium अपडेट झाले नाही, काहीतरी चूक झाली. Chromium अपडेट समस्या आणि अयशस्वी झालेल्या अपडेटचे निराकरण करा. नवीन Chromium प्रोफाइलमध्ये पुढे सुरू ठेवायचे आहे का? diff --git a/chrome/app/resources/chromium_strings_ms.xtb b/chrome/app/resources/chromium_strings_ms.xtb index a1048cbf09281e..205fbd700d2413 100644 --- a/chrome/app/resources/chromium_strings_ms.xtb +++ b/chrome/app/resources/chromium_strings_ms.xtb @@ -34,6 +34,7 @@ Semak URL melalui perbandingan dengan senarai laman tidak selamat yang disimpan dalam Chromium. Jika laman cuba mencuri kata laluan anda atau apabila anda memuat turun fail yang berbahaya, Chromium juga mungkin menghantar URL, termasuk sedikit kandungan halaman, kepada Penyemakan Imbas Selamat. Untuk menghantar nombor dari sini ke telefon Android anda, log masuk ke Chromium pada kedua-dua peranti. Sambungan ini telah menukar halaman yang ditunjukkan apabila anda memulakan Chromium. +Teruskan Sambungan "" telah menukar halaman yang ditunjukkan apabila anda memulakan Chromium. Chromium memerlukan kebenaran kamera dan mikrofon untuk laman ini Dalam Chromium @@ -110,6 +111,7 @@ Keluar daripada Chromium juga? Benarkan Chromium Dijalankan dalam Latar Belakang Sesuaikan dan kawal Chromium +Perlindungan yang dipertingkatkan melakukan pelbagai lagi perkara untuk menyekat pancingan data dan perisian hasad Selamat datang ke Chromium; tetingkap penyemak imbas baharu dibuka Chromium tidak dikemas kini, kesilapan telah berlaku. Selesaikan masalah kemas kini dan kegagalan kemas kini Chromium. Teruskan dalam profil Chromium baharu? diff --git a/chrome/app/resources/chromium_strings_my.xtb b/chrome/app/resources/chromium_strings_my.xtb index fe97914489ad72..a084b8dfece462 100644 --- a/chrome/app/resources/chromium_strings_my.xtb +++ b/chrome/app/resources/chromium_strings_my.xtb @@ -37,6 +37,7 @@ Chromium တွင် သိမ်းဆည်းထားသော လုံခြုံမှုမရှိသည့် ဝဘ်ဆိုက်များ၏ URL များကို စစ်ဆေးပေးသည်။ ဝဘ်ဆိုက်တစ်ခုက သင့်စကားဝှက်ကို ခိုးယူရန် ကြိုးပမ်းလာပါက သို့မဟုတ် အန္တရာယ်ရှိသည့်ဖိုင်တစ်ခုကို သင်ဒေါင်းလုဒ်လုပ်သည့်အခါ Chromium သည် Safe Browsing သို့ URL များအပြင် ဝဘ်ဆိုက်ပါ အကြောင်းအရာအချို့ကို ပို့နိုင်သည်။ ဤနေရာမှ သင်၏ Android ဖုန်းသို့ နံပါတ်တစ်ခုပို့ရန် စက်နှစ်ခုလုံးတွင် Chromium သို့ လက်မှတ်ထိုးဝင်ပါ။ သင် Chromium အား စသုံးသောအခါ စာမျက်နှာမှ ပြသသည်များကို ဤတိုးချဲလိုင်းမှ ပြောင်းလဲခဲ့၏။ +ဆက်လုပ်ရန် သင် Chromium အား စသုံးသောအခါ စာမျက်နှာမှ ပြသသည်ကို ဤ "" တိုးချဲလိုင်းမှ ပြောင်းလဲခဲ့၏။ Chromium သည် ဤဝဘ်ဆိုက်အတွက် ကင်မရာနှင့် မိုက်ခရိုဖုန်းခွင့်ပြုချက် လိုအပ်သည် Chromium တွင် @@ -113,6 +114,7 @@ မည်သို့ပင်ဖြစ်စေ Chromium မှ ထွက်လိုပါသလား။ Chromium ကို နောက်ခံတွင် ဖွင့်ခွင့်ပေးပါ Chromium ကို စိတ်ကြိုက် ပြုပြင်ရန် နှင့် ထိန်းချုပ်ရန် +အဆင့်မြှင့်တင်ထားသော ကာကွယ်မှုက ဖြားယောင်းမှုနှင့် မဲလ်ဝဲများကို ပိုမိုပိတ်ဆို့ပေးသည် Chromium က ကြိုဆိုပါသည်၊ ဘရောင်ဇာဝင်းဒိုးအသစ် ဖွင့်လိုက်ပါပြီ Chromium အပ်ဒိတ်လုပ်၍ မရပါ၊ တစ်ခုခု မှားသွားသည်။ Chromium အပ်ဒိတ်ပြဿနာများနှင့် လုပ်၍မရသော အပ်ဒိတ်များကို ပြင်ဆင်ပါ။ Chromium ပရိုဖိုင်အသစ်တွင် ဆက်လုပ်မလား။ diff --git a/chrome/app/resources/chromium_strings_ne.xtb b/chrome/app/resources/chromium_strings_ne.xtb index 013bc0b4c4a389..e5b38e354e3de6 100644 --- a/chrome/app/resources/chromium_strings_ne.xtb +++ b/chrome/app/resources/chromium_strings_ne.xtb @@ -36,6 +36,7 @@ Chromium मा भण्डारण गरिएका असुरक्षित साइटको सूची जाँच गरी URL हरू सुरक्षित छन् कि छैनन् भन्ने कुरा यकिन गर्छ। कुनै साइटले तपाईंको पासवर्ड चोरी गर्न खोज्दा वा तपाईंले कुनै हानिकारक फाइल डाउनलोड गर्दा Chromium ले पेजमा भएका केही सामग्रीसहित उक्त साइटका URL हरू Safe Browsing मा पठाउन पनि सक्छ। यहाँबाट आफ्नो Android फोनमा कुनै नम्बर पठाउन दुवै यन्त्रमा Chromium मा साइन इन गर्नुहोस्। यो विस्तारले तपाईँले Chromium सुरु गर्दा देखाइएको पृष्ठलाई परिवर्तन गरेको छ। +जारी राख्नुहोस् विस्तार "" ले तपाईँले Chromium सुरु गर्दा देखाइएको पृष्ठलाई परिवर्तन गरेको छ। यो साइट चलाउन Chromium लाई क्यामेरा तथा माइक्रोफोन प्रयोग गर्ने अनुमति दिनु पर्ने हुन्छ Chromium मा @@ -110,6 +111,7 @@ जे भए पनि Chromium बाट बाहिरिने हो? Chromium लाई पृष्ठभूमिमा चल्न दिनुहोस् Chromium आफू अनुकूल र नियन्त्रण गर्नुहोस् +परिष्कृत सुरक्षा प्रयोग गरी फिसिङ तथा मालवेयरमाथि अझ राम्रोसँग रोक लगाउन सकिन्छ Chromium मा तपाईंलाई स्वागत छ; ब्राउजरको नयाँ विन्डो खोलियो Chromium अद्यावधिक भएन, केही चिज गडबड भयो। Chromium अद्यावधिक गर्दा देखिएका समस्या तथा अद्यावधिक नहुने समस्याहरू समाधान गर्नुहोस्। नयाँ Chromium प्रोफाइल प्रयोग गरी साइन इन गर्ने हो? diff --git a/chrome/app/resources/chromium_strings_nl.xtb b/chrome/app/resources/chromium_strings_nl.xtb index 07b62eedb3eeab..e721b13121e8f9 100644 --- a/chrome/app/resources/chromium_strings_nl.xtb +++ b/chrome/app/resources/chromium_strings_nl.xtb @@ -36,6 +36,7 @@ Sommige functies zijn wellicht niet beschikbaar en wijzigingen in voorkeuren wor Checkt URL's aan de hand van een lijst met onveilige sites die is opgeslagen in Chromium. Als een site je wachtwoord probeert te stelen of als je een schadelijk bestand downloadt, kan Chromium ook URL's, inclusief delen van de paginacontent, naar Safe Browsing sturen. Als je een nummer hier vandaan naar je Android-telefoon wilt sturen, log je in bij Chromium op beide apparaten. Deze extensie heeft gewijzigd welke pagina wordt getoond wanneer je Chromium start. +Doorgaan De extensie heeft gewijzigd welke pagina je ziet als je Chromium start. Chromium heeft camera- en microfoonrechten nodig voor deze site In Chromium @@ -112,6 +113,7 @@ Sommige functies zijn wellicht niet beschikbaar en wijzigingen in voorkeuren wor Chromium toch sluiten? Chromium laten uitvoeren op de achtergrond Chromium aanpassen en beheren +Geoptimaliseerde beveiliging die je nog beter beschermt tegen phishing en malware Welkom bij Chromium, nieuw browservenster geopend Chromium is niet geüpdatet. Er is een fout opgetreden. Updateproblemen en mislukte updates voor Chromium verhelpen Doorgaan met een nieuw Chromium-profiel? diff --git a/chrome/app/resources/chromium_strings_no.xtb b/chrome/app/resources/chromium_strings_no.xtb index 43c32c14a0a706..8a2f2f0bec712d 100644 --- a/chrome/app/resources/chromium_strings_no.xtb +++ b/chrome/app/resources/chromium_strings_no.xtb @@ -34,6 +34,7 @@ Kontrollerer nettadresser opp mot en liste i Chromium over utrygge nettsteder. Hvis nettsteder prøver å stjele passordet ditt, eller når du laster ned skadelige filer, kan Chromium også sende nettadresser, inkludert deler av sideinnholdet, til Safe Browsing. For å sende numre herfra til Android-telefonen din, logg på Chromium på begge enhetene. Denne utvidelsen har endret hvilken side som vises når du starter Chromium. +Fortsett Utvidelsen «» har endret hvilken side som vises når du starter Chromium. Chromium trenger kamera- og mikrofontillatelse for dette nettstedet I Chromium @@ -110,6 +111,7 @@ Vil du avslutte Chromium likevel? La Chromium kjøre i bakgrunnen Tilpass og kontrollér Chromium +Økt beskyttelse gjør mer for å blokkere nettfisking og skadelig programvare Velkommen til Chromium – et nytt nettleservindu er åpnet Chromium ble ikke oppdatert. Noe gikk galt. Løs problemer med Chromium-oppdateringer og mislykkede oppdateringer. Vil du fortsette i en ny Chromium-profil? diff --git a/chrome/app/resources/chromium_strings_or.xtb b/chrome/app/resources/chromium_strings_or.xtb index 87c1065fe1aa10..c5e49220241b38 100644 --- a/chrome/app/resources/chromium_strings_or.xtb +++ b/chrome/app/resources/chromium_strings_or.xtb @@ -36,6 +36,7 @@ Chromiumରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଅସୁରକ୍ଷିତ ସାଇଟଗୁଡ଼ିକର ଏକ ତାଲିକା ସହିତ URLଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରେ। ଯଦି କୌଣସି ସାଇଟ ଆପଣଙ୍କ ପାସୱାର୍ଡ ଚୋରି କରିବାକୁ ଚେଷ୍ଟା କରେ କିମ୍ବା ଆପଣ ଏକ କ୍ଷତିକାରକ ଫାଇଲ ଡାଉନଲୋଡ କଲେ, ପୃଷ୍ଠାର କିଛି ବିଷୟବସ୍ତୁ ସହିତ URLଗୁଡ଼ିକୁ ମଧ୍ୟ Chromium ସୁରକ୍ଷିତ ବ୍ରାଉଜିଂକୁ ପଠାଇପାରେ। ଏଠାରୁ ଆପଣଙ୍କ Android ଫୋନକୁ ଏକ ନମ୍ବର ପଠାଇବାକୁ, ଉଭୟ ଡିଭାଇସରେ Chromiumରେ ସାଇନ୍ ଇନ୍ କରନ୍ତୁ। ଏହି ଏକ୍ସଟେନ୍‌ସନ୍‌ ଏହା ପରିବର୍ତ୍ତନ କରିଛି ଯେ ଯେତେବେଳେ ଆପଣ Chromium ଆରମ୍ଭ କରନ୍ତି, ସେତେବେଳେ କେଉଁ ପୃଷ୍ଠା ଦେଖାଯିବ। +ଜାରି ରଖନ୍ତୁ ଆପଣ ଯେତେବେଳେ Chromium ଆରମ୍ଭ କରିବେ, ସେତେବେଳେ କେଉଁ ପୃଷ୍ଠାଗୁଡ଼ିକ ଦେଖାଯିବ ତାହା "" ଏକ୍ସଟେନ୍‌ସନ୍ ବଦଳାଇଦିଏ। ଏହି ସାଇଟ୍ ପାଇଁ Chromium କ୍ୟାମେରା ଏବଂ ମାଇକ୍ରୋଫୋନ୍ ଅନୁମତି ଆବଶ୍ୟକ କରେ Chromiumରେ @@ -112,6 +113,7 @@ ଯେକୌଣସିମତେ Chromiumରୁ ବାହାରିବେ? ପୃଷ୍ଠପଟରେ Chromiumକୁ ଚାଲିବାକୁ ଦିଅନ୍ତୁ Chromium କଷ୍ଟମାଇଜ୍ ଓ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ +ଉନ୍ନତ ସୁରକ୍ଷା ଫିସିଂ ଓ ମାଲୱେୟାରକୁ ବ୍ଲକ୍ କରିବାକୁ ଅନେକ କିଛି କରେ Chromiumକୁ ସ୍ୱାଗତ; ନୂଆ ବ୍ରାଉଜର୍ ୱିଣ୍ଡୋ ଖୋଲାଯାଇଛି Chromium ଅପଡେଟ୍ ହେଲା ନାହିଁ, କିଛି ତ୍ରୁଟି ହୋଇଗଲା। Chromium ଅପଡେଟ୍ ସମସ୍ୟା ଏବଂ ବିଫଳ ଅପଡେଟଗୁଡ଼ିକର ସମାଧାନ କରନ୍ତୁ। ଏକ ନୂଆ Chromium ପ୍ରୋଫାଇଲରେ ଜାରି ରଖିବେ? diff --git a/chrome/app/resources/chromium_strings_pa.xtb b/chrome/app/resources/chromium_strings_pa.xtb index 945f62bede65a3..6245d216a148d5 100644 --- a/chrome/app/resources/chromium_strings_pa.xtb +++ b/chrome/app/resources/chromium_strings_pa.xtb @@ -36,6 +36,7 @@ Chromium ਵਿੱਚ ਸਟੋਰ ਕੀਤੀਆਂ ਅਸੁਰੱਖਿਅਤ ਸਾਈਟਾਂ ਦੀ ਸੂਚੀ ਦੇ ਨਾਲ URL ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਜੇ ਕੋਈ ਸਾਈਟ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਨੂੰ ਚੋਰੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੀ ਹੈ ਜਾਂ ਜਦੋਂ ਤੁਸੀਂ ਕੋਈ ਨੁਕਸਾਨਦੇਹ ਫ਼ਾਈਲ ਡਾਊਨਲੋਡ ਕਰਦੇ ਹੋ, ਤਾਂ Chromium ਸੁਰੱਖਿਅਤ ਬ੍ਰਾਊਜ਼ਿੰਗ ਨੂੰ ਪੰਨੇ ਦੀ ਥੋੜ੍ਹੀ ਸਮੱਗਰੀ ਸਮੇਤ URL ਵੀ ਭੇਜ ਸਕਦਾ ਹੈ। ਇੱਥੋਂ ਆਪਣੇ Android ਫ਼ੋਨ 'ਤੇ ਨੰਬਰ ਭੇਜਣ ਲਈ, ਦੋਵੇਂ ਡੀਵਾਈਸਾਂ 'ਤੇ Chromium ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ। ਇਸ ਐਕਸਟੈਂਸ਼ਨ ਨੇ ਤੁਹਾਡੇ ਵੱਲੋਂ Chromium ਸ਼ੁਰੂ ਕੀਤੇ ਜਾਣ ਵੇਲੇ ਦਿਖਾਏ ਗਏ ਪੰਨੇ ਨੂੰ ਬਦਲ ਦਿੱਤਾ ਹੈ। +ਜਾਰੀ ਰੱਖੋ ਐਕਸਟੈਂਸ਼ਨ "" ਬਦਲਿਆ ਗਿਆ ਹੈ ਕਿ ਕਿਹੜਾ ਸਫ਼ਾ ਦਿਖਾਇਆ ਜਾਂਦਾ ਹੈ ਜਦੋਂ ਤੁਸੀਂ Chromium ਚਾਲੂ ਕਰਦੇ ਹੋ। Chromium ਨੂੰ ਇਸ ਸਾਈਟ ਲਈ ਕੈਮਰਾ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ Chromium ਵਿੱਚ @@ -112,6 +113,7 @@ ਕੀ ਫਿਰ ਵੀ Chromium ਤੋਂ ਬਾਹਰ ਜਾਣਾ ਹੈ? Chromium ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦਿਓ Google Chrome ਨੂੰ ਵਿਉਂਤਬੱਧ ਕਰਕੇ ਕੰਟਰੋਲ ਕਰੋ। +ਧੋਖਾਧੜੀ ਅਤੇ ਮਾਲਵੇਅਰ ਨੂੰ ਬਲਾਕ ਕਰਨ ਵਾਸਤੇ ਵਿਸਤ੍ਰਿਤ ਸੁਰੱਖਿਆ ਹੋਰ ਵੱਧ ਕੰਮ ਕਰਦੀ ਹੈ Chromium ਵਿੱਚ ਜੀ ਆਇਆਂ ਨੂੰ; ਨਵੀਂ ਬ੍ਰਾਊਜ਼ਰ ਵਿੰਡੋ ਖੋਲ੍ਹੀ ਗਈ Chromium ਅੱਪਡੇਟ ਨਹੀਂ ਹੋਇਆ, ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ। Chromium ਅੱਪਡੇਟ ਦੀਆਂ ਸਮੱਸਿਆਵਾਂ ਅਤੇ ਅਸਫਲ ਹੋਈਆਂ ਅੱਪਡੇਟਾਂ ਨੂੰ ਠੀਕ ਕਰੋ। ਕੀ ਨਵੇਂ Chromium ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਜਾਰੀ ਰੱਖਣਾ ਹੈ? diff --git a/chrome/app/resources/chromium_strings_pl.xtb b/chrome/app/resources/chromium_strings_pl.xtb index aa082570594a08..0d23dfb44e7673 100644 --- a/chrome/app/resources/chromium_strings_pl.xtb +++ b/chrome/app/resources/chromium_strings_pl.xtb @@ -34,6 +34,7 @@ Sprawdza, czy URL jest na liście niebezpiecznych stron zapisanej w Chromium. Jeśli strona próbuje wykraść Twoje hasło lub pobierasz szkodliwy plik, Chromium może też wysłać URL wraz z fragmentami zawartości strony do usługi Bezpieczne przeglądanie. Aby wysłać stąd numer na swój telefon z Androidem, zaloguj się w Chromium na obu urządzeniach. To rozszerzenie ustawiło inną stronę wyświetlaną po uruchomieniu Chromium. +Dalej Rozszerzenie „” ustawiło inną stronę wyświetlaną po uruchomieniu Chromium. Ta strona musi mieć w Chromium dostęp do aparatu i mikrofonu W Chromium @@ -108,6 +109,7 @@ Zamknąć Chromium mimo to? Zezwalaj Chromium na działanie w tle Dostosowywanie i kontrolowanie Chromium +Silniejsza ochrona lepiej chroni przed phishingiem i złośliwym oprogramowaniem Witamy w Chromium. Zostało otwarte nowe okno przeglądarki. Coś poszło nie tak i nie udało się zaktualizować Chromium. Napraw nieudane aktualizacje Chromium i rozwiąż inne problemy z aktualizacjami Kontynuować w nowym profilu Chromium? diff --git a/chrome/app/resources/chromium_strings_pt-BR.xtb b/chrome/app/resources/chromium_strings_pt-BR.xtb index e743d4b3f0fd3d..90c6315dcd703b 100644 --- a/chrome/app/resources/chromium_strings_pt-BR.xtb +++ b/chrome/app/resources/chromium_strings_pt-BR.xtb @@ -34,6 +34,7 @@ Confere se os URLs estão em uma lista de sites não seguros armazenada no Chromium. Se um site tentar roubar sua senha ou se você fizer o download de um arquivo nocivo, o Chromium também poderá enviar os URLs, incluindo partes do conteúdo da página, para o Navegação segura. Para enviar um número daqui para seu smartphone Android, faça login no Chromium nos dois dispositivos. Esta extensão alterou a página que é exibida quando você inicia o Chromium. +Continuar A extensão "" alterou a página que é exibida quando você inicia o Chromium. O Chromium precisa da permissão de acesso ao microfone e à câmera para este site No Chromium @@ -108,6 +109,7 @@ Sair do Chromium mesmo assim? Permitir a execução do Chromium em segundo plano Personalizar e controlar o Chromium +A Proteção reforçada é mais eficiente no combate a golpes de phishing e malware Conheça o Chromium. Nova janela do navegador aberta A atualização do Chromium não foi concluída. Algo deu errado. Corrija as atualizações com falhas e os problemas de atualização do Chromium. Continuar em um perfil novo do Chromium? diff --git a/chrome/app/resources/chromium_strings_pt-PT.xtb b/chrome/app/resources/chromium_strings_pt-PT.xtb index 52faa6f4b54dfa..b7b0edaab65585 100644 --- a/chrome/app/resources/chromium_strings_pt-PT.xtb +++ b/chrome/app/resources/chromium_strings_pt-PT.xtb @@ -34,6 +34,7 @@ Verifica os URLs com base numa lista de sites inseguros armazenada no Chromium. Se um site tentar roubar a sua palavra-passe, ou quando transferir um ficheiro prejudicial, o Chromium também pode enviar URLs, incluindo bits de conteúdo das páginas, para a Navegação segura. Para enviar um número daqui para o seu telemóvel Android, inicie sessão no Chromium em ambos os dispositivos. Esta extensão alterou a página apresentada quando inicia o Chromium. +Continuar A extensão "" alterou a página apresentada quando inicia o Chromium. O Chromium necessita de autorizações da câmara e do microfone para este site No Chromium @@ -110,6 +111,7 @@ Pretende sair do Chromium mesmo assim? Permitir que o Chromium seja executado em segundo plano Personalizar e controlar o Chromium +A proteção melhorada vai mais além para bloquear o phishing e o software malicioso. Damos-lhe as boas-vindas ao Chromium; nova janela do navegador aberta O Chromium não foi atualizado. Ocorreu um erro. Corrija problemas de atualização do Chrome e falhas nas atualizações. Pretende continuar num novo perfil do Chromium? diff --git a/chrome/app/resources/chromium_strings_ro.xtb b/chrome/app/resources/chromium_strings_ro.xtb index 604ca921894f9c..51978f3fdb3e52 100644 --- a/chrome/app/resources/chromium_strings_ro.xtb +++ b/chrome/app/resources/chromium_strings_ro.xtb @@ -34,6 +34,7 @@ Verifică adresele URL folosind o listă de site-uri nesigure, stocată în Chromium. Dacă un site încearcă să îți fure parola sau descarci un fișier dăunător, Chromium poate să trimită adresele URL, inclusiv fragmente din conținutul paginilor, către funcția Navigare sigură. Pentru a trimite un număr de aici pe telefonul Android, conectează-te la Chromium pe ambele dispozitive. Această extensie a modificat ce pagină se afișează când pornești Chromium. +Continuă Extensia „” a modificat ce pagină se afișează când pornești Chromium. Chromium are nevoie de acces la cameră și microfon pentru acest site În Chromium @@ -110,6 +111,7 @@ Ieși din Chromium oricum? Permite Chromium să ruleze în fundal Personalizați și controlați Chromium +Protecția îmbunătățită face mai multe pentru blocarea phishingului și a programelor malware Bun venit la Chromium; fereastră de browser nouă deschisă Chromium nu s-a actualizat. A apărut o eroare. Remediază problemele de actualizare și actualizările nereușite în Chromium. Continui cu un profil Chromium nou? diff --git a/chrome/app/resources/chromium_strings_ru.xtb b/chrome/app/resources/chromium_strings_ru.xtb index 07bf3660a2fd20..9a654523814622 100644 --- a/chrome/app/resources/chromium_strings_ru.xtb +++ b/chrome/app/resources/chromium_strings_ru.xtb @@ -34,6 +34,7 @@ Сверяет URL со списком небезопасных сайтов в Chromium. Если вы скачаете вредоносный файл или сайт попытается похитить ваш пароль, Chromium может отправить URL с образцами контента на проверку с помощью Безопасного просмотра. Чтобы отправить номер на телефон Android, войдите в Chromium на обоих устройствах. Расширение изменило стартовую страницу Chromium. +Продолжить Расширение "" изменило стартовую страницу Chromium. Браузер Chromium запрашивает доступ к камере и микрофону для этого сайта. В Chromium @@ -108,6 +109,7 @@ Закрыть Chromium? Разрешить Chromium работать в фоновом режиме Настройка и управление Chromium +В режиме "Улучшенная защита" фишинговые атаки и вредоносное ПО блокируются ещё эффективнее. Добро пожаловать в Chromium! Открыто новое окно браузера. Не удалось обновить Chromium. Выяснить причины неполадок и устранить их Продолжить в новом профиле Chromium? diff --git a/chrome/app/resources/chromium_strings_si.xtb b/chrome/app/resources/chromium_strings_si.xtb index 716d1f8a5ccbaf..c1b10485c21bf8 100644 --- a/chrome/app/resources/chromium_strings_si.xtb +++ b/chrome/app/resources/chromium_strings_si.xtb @@ -36,6 +36,7 @@ Chromium තුළ ගබඩා කර ඇති අනාරක්ෂිත වෙබ් අඩවි ලැයිස්තුවක් සමඟ URL පරීක්ෂා කරයි. අඩවියක් ඔබගේ මුරපදය සොරා ගැනීමට උත්සාහ කරන්නේ නම්, හෝ ඔබ හානිකර ගොනුවක් බාගන්නා විට, Chromium පිටු අන්තර්ගතයේ කැබලි ඇතුළුව, URL සුරක්ෂිත බ්‍රවුස් කිරීම වෙත යැවීමටද හැකිය. මෙහි සිට ඔබගේ Android දුරකථනයට අංකයක් යැවීමට, උපාංග දෙකෙහිම Chromium වෙත පුරන්න. මෙම දිගුව විසින් ඔබ Chromium ආරම්භ කරන විට පෙන්වන පිටුව වෙනස් කර ඇත. +කරගෙන යන්න "" දිගුව විසින් ඔබ Chromium ආරම්භ කරන විට පෙන්වන පිටුව වෙනස් කර ඇත. මෙම අඩවිය සඳහා Chromium හට මයික්‍රෆෝන සහ කැමරා අවසරය අවශ්‍යයි Chromium තුළ @@ -112,6 +113,7 @@ කෙසේ වුවත් Chromium වෙතින් ඉවත් වන්න ද? Chromium හට පසුබිම ධාවනය වීමට ඉඩ දෙන්න Chromium පාලනය හා රුචිකරණය +තතුබෑම් සහ අනිෂ්ට මෘදුකාංග අවහිර කිරීමට වැඩි දියුණු කළ ආරක්ෂාව වැඩි දෙයක් කරයි Chromium වෙත සාදරයෙන් පිළිගනිමු; නව බ්‍රවුසර කවුළුවක් විවෘත කරන ලදි Chromium යාවත්කාලීන නොවිය, යම් දෙයක් වැරදිණි. Chromium යාවත්කාලීන ගැටලු සහ අසමත් වූ යාවත්කාලීන නිරාකරණ කරන්න. නව Chromium පැතිකඩක ඉදිරියට යන්නද? diff --git a/chrome/app/resources/chromium_strings_sk.xtb b/chrome/app/resources/chromium_strings_sk.xtb index 522b2d415cfe8b..f63767f92887f4 100644 --- a/chrome/app/resources/chromium_strings_sk.xtb +++ b/chrome/app/resources/chromium_strings_sk.xtb @@ -36,6 +36,7 @@ Niektoré funkcie nemusia byť k dispozícii a zmeny vykonané v predvoľbách s Kontroluje webové adresy podľa zoznamu nebezpečných webov uloženého v prehliadači Chromium. Ak sa vám určitý web pokúsi ukradnúť heslo alebo stiahnete škodlivý súbor, Chromium môže tiež odoslať webové adresy vrátane častí obsahu stránky Bezpečnému prehliadaniu. Ak chcete odtiaľto odoslať číslo do svojho telefónu s Androidom, prihláste sa v oboch zariadeniach do prehliadača Chromium. Toto rozšírenie zmenilo stránku, ktorá sa zobrazí pri spustení prehliadača Chromium. +Pokračovať Rozšírenie „“ zmenilo stránku, ktorá sa zobrazí pri spustení prehliadača Chromium. Chromium vyžaduje pre tento web povolený prístup ku kamere aj mikrofónu V prehliadači Chromium @@ -112,6 +113,7 @@ Niektoré funkcie nemusia byť k dispozícii a zmeny vykonané v predvoľbách s Chcete Chromium napriek tomu ukončiť? Povoliť prehliadaču Chromium spustenie na pozadí Prispôsobiť a spravovať Chromium +Rozšírená ochrana efektívnejšie blokuje phishing aj malvér Vitajte v prehliadači Chromium, otvorilo sa nové okno prehliadača Chromium sa neaktualizoval. Vyskytol sa problém. Vyriešiť problémy so sťahovaním aktualizácií prehliadača Chromium a neúspešnými aktualizáciami Chcete pokračovať v novom profile prehliadača Chromium? diff --git a/chrome/app/resources/chromium_strings_sl.xtb b/chrome/app/resources/chromium_strings_sl.xtb index ad29ace757e534..2b9aacda77cdbf 100644 --- a/chrome/app/resources/chromium_strings_sl.xtb +++ b/chrome/app/resources/chromium_strings_sl.xtb @@ -36,6 +36,7 @@ Nekatere funkcije morda niso na voljo in spremembe nastavitev ne bodo shranjene. Preveri URL-je, tako da jih primerja s seznamom spletnih mest, ki niso varna, shranjenim v Chromiumu. Če vam spletno mesto poskusi ukrasti geslo ali če prenašate škodljivo datoteko, lahko Chromium prav tako pošlje URL-je, vključno z delčki vsebine strani, Varnemu brskanju. Če želite poslati telefonsko številko od tukaj v telefon Android, se prijavite v Chromium v obeh napravah. Zaradi te razširitve se je spremenila stran, ki je prikazana, ko zaženete Chromium. +Naprej Zaradi razširitve »« se je spremenila stran, ki je prikazana, ko zaženete Chromium. Chromium potrebuje dovoljenje za fotoaparat in mikrofon za to spletno mesto. V Chromiumu @@ -112,6 +113,7 @@ Nekatere funkcije morda niso na voljo in spremembe nastavitev ne bodo shranjene. Želite vseeno zapreti Chromium? Naj se Chromium izvaja v ozadju Prilagajanje in nadziranje Chromiuma +Izboljšana zaščita učinkoviteje blokira lažno predstavljanje in zlonamerno programsko opremo. Pozdravljeni v Chromiumu; odprlo se je novo okno brskalnika Chromium se ni posodobil, prišlo je do napake. Odpravite težave s posodobitvijo Chromiuma in neuspelimi posodobitvami Chromiuma. Ali želite nadaljevati v novem profilu v Chromiumu? diff --git a/chrome/app/resources/chromium_strings_sq.xtb b/chrome/app/resources/chromium_strings_sq.xtb index 9e498522fd8928..92f22274fa610b 100644 --- a/chrome/app/resources/chromium_strings_sq.xtb +++ b/chrome/app/resources/chromium_strings_sq.xtb @@ -36,6 +36,7 @@ Disa funksione mund të mos ofrohen dhe ndryshimet në preferenca nuk do të ruh Kontrollon URL-të kundrejt një liste sajtesh të pasigurta të ruajtur në Chromium. Nëse një sajt përpiqet të vjedhë fjalëkalimin tënd ose kur shkarkon një skedar të dëmshëm, Chromium mund t'i dërgojë gjithashtu URL-të, duke përfshirë pjesë të përmbajtjes së faqes, te "Shfletimi i sigurt". Për të dërguar një numër nga këtu te telefoni yt Android, identifikohu në Chromium në të dyja pajisjet. Kjo shtesë ka ndryshuar se cila faqe shfaqet kur nis Chromium. +Vazhdo Shtesa "" ka ndryshuar se cila faqe shfaqet kur nis Chromium. Chromium ka nevojë për lejet e kamerës dhe të mikrofonit për këtë sajt Në Chromium @@ -112,6 +113,7 @@ Disa funksione mund të mos ofrohen dhe ndryshimet në preferenca nuk do të ruh Dëshiron të dalësh nga Chromium gjithsesi? Lejo që Chromium të ekzekutohet në sfond Personalizo dhe kontrollo Chromium +Mbrojtja e përmirësuar bën edhe më shumë për bllokimin e mashtrimeve dhe softuerëve keqdashës Mirë se erdhe në Chromium. U hap një dritare e re e shfletuesit Chromium nuk u përditësua. Ndodhi një gabim. Rregullo problemet e përditësimit të Chromium dhe përditësimet e dështuara. Të vazhdohet te një profil i ri i Chromium? diff --git a/chrome/app/resources/chromium_strings_sr-Latn.xtb b/chrome/app/resources/chromium_strings_sr-Latn.xtb index d84e68f36c7767..f430ec6b1ab957 100644 --- a/chrome/app/resources/chromium_strings_sr-Latn.xtb +++ b/chrome/app/resources/chromium_strings_sr-Latn.xtb @@ -36,6 +36,7 @@ Neke funkcije su možda nedostupne i promene podešavanja neće biti sačuvane. Proverava URL-ove sa listom nebezbednih sajtova koji se čuvaju u Chromium-u. Ako neki sajt pokuša da ukrade vašu lozinku ili probate da preuzmete štetnu datoteku, Chromium može da pošalje URL-ove, uključujući delove sadržaja stranice, u Bezbedno pregledanje. Da biste poslali broj sa ovog uređaja na Android telefon, prijavite se u Chromium na oba uređaja. Ovaj dodatak je promenio stranicu koja se prikazuje kada pokrenete Chromium. +Nastavite Dodatak „“ je promenio stranicu koja se prikazuje kada pokrenete Chromium. Chromium-u su potrebne dozvole za kameru i mikrofon za ovaj sajt U Chromium-u @@ -112,6 +113,7 @@ Neke funkcije su možda nedostupne i promene podešavanja neće biti sačuvane. Želite li ipak da zatvorite Chromium? Neka Chromium radi u pozadini Prilagodite i kontrolišite Chromium +Poboljšana zaštita nudi više mogućnosti za blokiranje „pecanja“ i malvera Dobro došli u Chromium; otvoren je novi prozor pregledača Chromium se nije ažurirao. Došlo je do greške. Otklonite probleme sa ažuriranjem Chromium-a i neuspela ažuriranja. Želite da nastavite na novom Chromium profilu? diff --git a/chrome/app/resources/chromium_strings_sr.xtb b/chrome/app/resources/chromium_strings_sr.xtb index 2ab8d4a143a17d..7216dc531ce997 100644 --- a/chrome/app/resources/chromium_strings_sr.xtb +++ b/chrome/app/resources/chromium_strings_sr.xtb @@ -36,6 +36,7 @@ Проверава URL-ове са листом небезбедних сајтова који се чувају у Chromium-у. Ако неки сајт покуша да украде вашу лозинку или пробате да преузмете штетну датотеку, Chromium може да пошаље URL-ове, укључујући делове садржаја странице, у Безбедно прегледање. Да бисте послали број са овог уређаја на Android телефон, пријавите се у Chromium на оба уређаја. Овај додатак је променио страницу која се приказује када покренете Chromium. +Наставите Додатак „“ је променио страницу која се приказује када покренете Chromium. Chromium-у су потребне дозволе за камеру и микрофон за овај сајт У Chromium-у @@ -112,6 +113,7 @@ Желите ли ипак да затворите Chromium? Нека Chromium ради у позадини Прилагодите и контролишите Chromium +Побољшана заштита нуди више могућности за блокирање „пецања“ и малвера Добро дошли у Chromium; отворен је нови прозор прегледача Chromium се није ажурирао. Дошло је до грешке. Отклоните проблеме са ажурирањем Chromium-а и неуспела ажурирања. Желите да наставите на новом Chromium профилу? diff --git a/chrome/app/resources/chromium_strings_sv.xtb b/chrome/app/resources/chromium_strings_sv.xtb index 472acfea5421bb..aec159d5e33dee 100644 --- a/chrome/app/resources/chromium_strings_sv.xtb +++ b/chrome/app/resources/chromium_strings_sv.xtb @@ -36,6 +36,7 @@ Vissa funktioner kanske inte är tillgängliga och ändringar i inställningarna Kontrollera webbadresser mot en lista över osäkra webbplatser i Chromium. Om du utsätts för försök att kapa ditt lösenord på en webbplats eller om du laddar ned en skadlig fil kan webbadresserna skickas från Chromium till Säker webbsökning tillsammans med delar av sidinnehållet. Logga in på Chromium på båda enheterna om du vill skicka ett nummer från Android-telefonen. Det här tillägget har ändrat vilken sida som visas när du startar Chromium. +Fortsätt Tillägget har ändrat vilken sida som visas när du startar Chromium. Du behöver ge Chromium kamera- och mikrofonbehörighet för den här webbplatsen I Chromium @@ -112,6 +113,7 @@ Vissa funktioner kanske inte är tillgängliga och ändringar i inställningarna Vill du avsluta Chromium ändå? Låt Chromium köras i bakgrunden Anpassa och kontrollera Chromium +Förbättrat skydd är bättre på att blockera nätfiske och skadlig programvara Välkommen till Chromium, ett nytt webbläsarfönster har öppnats Ett fel uppstod och Chromium uppdaterades inte. Åtgärda uppdateringsproblem och misslyckade uppdateringar i Chromium. Vill du fortsätta med en ny Chromium-profil? diff --git a/chrome/app/resources/chromium_strings_sw.xtb b/chrome/app/resources/chromium_strings_sw.xtb index 28e0874905ffa0..60e8c7c30deb75 100644 --- a/chrome/app/resources/chromium_strings_sw.xtb +++ b/chrome/app/resources/chromium_strings_sw.xtb @@ -36,6 +36,7 @@ Baadhi ya vipengele huenda visipatikane na mabadiliko katika mapendeleo hayatahi Hukagua URL ili kuona iwapo zipo kwenye orodha ya tovuti zisizo salama zilizohifadhiwa katika Chromium. Ikiwa tovuti inajaribu kuiba nenosiri lako au unapopakua faili hatari, Chromium inaweza pia kutuma URL, ikiwa ni pamoja na sehemu za maudhui ya ukurasa, kwa kipengele cha Kuvinjari Salama. Ili uweze kutuma nambari kwa simu yako ya Android kutoka hapa, ingia katika akaunti kwenye Chromium ukitumia vifaa vyote viwili. Kiendelezi hiki kimebadilisha ukurasa unaoonyeshwa unapoanzisha Chromium. +Endelea Kiendelezi hiki "" kimebadilisha ukurasa unaoonyeshwa unapoanzisha Chromium. Chromium inahitaji ruhusa ya kufikia kamera na maikrofoni kwa ajili ya tovuti hii Katika Chromium @@ -112,6 +113,7 @@ Baadhi ya vipengele huenda visipatikane na mabadiliko katika mapendeleo hayatahi Ungependa kufunga Chromium? Ruhusu Chromium itumike Chinichini Dhibiti na ugeuze Chromium ikufae +Kipengele cha ulinzi wa hali ya juu hufanya mengi zaidi ili kuzuia programu hasidi na wizi wa data binafsi Karibu kwenye Chromium; dirisha jipya la kivinjari limefunguliwa Chromium haijasasishwa, hitilafu fulani imetokea. Rekebisha matatizo ya sasisho la Chromium na masasisho ambayo hayakuwekwa. Ungependa kutumia wasifu mpya kwenye Chromium? diff --git a/chrome/app/resources/chromium_strings_ta.xtb b/chrome/app/resources/chromium_strings_ta.xtb index 4c1af7aac8b186..2dc9b445513aba 100644 --- a/chrome/app/resources/chromium_strings_ta.xtb +++ b/chrome/app/resources/chromium_strings_ta.xtb @@ -34,6 +34,7 @@ Chromiumமில் சேமிக்கப்பட்டுள்ள பாதுகாப்பில்லாத தளங்களின் பட்டியலைப் பயன்படுத்தி URLகளைச் சரிபார்க்கும். ஏதாவதொரு தளம் உங்கள் கடவுச்சொல்லைத் திருட முயன்றாலோ தீங்குவிளைவிக்கும் ஃபைலை நீங்கள் பதிவிறக்கினாலோ Chromium, பாதுகாப்பு உலாவல் விழிப்பூட்டல்களில் பக்க உள்ளடக்கத்தின் சிறிய பகுதிகள் உட்பட URLகளையும் அனுப்பக்கூடும். இதிலிருந்து உங்கள் Android மொபைலுக்கு ஓர் எண்ணை அனுப்ப, இரு சாதனங்களிலும் Chromiumமில் உள்நுழையுங்கள். Chromiumஐத் தொடங்கும் போது காண்பிக்கப்படும் பக்கத்தை இந்த நீட்டிப்பு மாற்றியுள்ளது. +தொடர்க Chromiumஐத் தொடங்கும் போது காண்பிக்கப்படும் பக்கத்தை, "" நீட்டிப்பு மாற்றியுள்ளது. இந்தத் தளத்தை அணுக, Chromiumமிற்கு கேமரா மற்றும் மைக்ரோஃபோன் அணுகல் தேவை Chromium இல் @@ -110,6 +111,7 @@ Chromium இலிருந்து வெளியேறவா? பின்னணியில் Chromiumஐ இயங்க அனுமதி Chromium ஐ தனிப்பயனாக்கி கட்டுப்படுத்துக +ஃபிஷிங்கையும் மால்வேரையும் தடுக்க மேம்பட்ட பாதுகாப்பு உதவுகிறது Chromiumமிற்கு வரவேற்கிறோம்; புதிய உலாவிச் சாளரம் திறக்கப்பட்டது ஏதோ தவறாகிவிட்டதால் Chromium புதுப்பிக்கப்படவில்லை. Chromium புதுப்பிப்பு குறித்த சிக்கல்களையும் தோல்வியடைந்த புதுப்பிப்புகளையும் சரிசெய்யவும். புதிய Chromium சுயவிவரத்தில் தொடரவா? diff --git a/chrome/app/resources/chromium_strings_te.xtb b/chrome/app/resources/chromium_strings_te.xtb index 9596e417fb1077..1ba3b9525ff759 100644 --- a/chrome/app/resources/chromium_strings_te.xtb +++ b/chrome/app/resources/chromium_strings_te.xtb @@ -34,6 +34,7 @@ Chromiumలో స్టోర్ చేయబడిన సురక్షితం కాని సైట్‌ల లిస్ట్‌తో కూడిన URLలను చెక్ చేస్తుంది. ఏదైనా సైట్ మీ పాస్‌వర్డ్‌ను దొంగిలించే ప్రయత్నం చేసినా, లేదంటే ఏదైనా హానికరమైన ఫైల్‌ను మీరు డౌన్‌లోడ్ చేసినా, సదరు URLలను, ఆయా పేజీల కంటెంట్‌లోని కొన్ని భాగాలను కూడా Chromium, 'సురక్షిత బ్రౌజింగ్'కు పంపవచ్చు. ఇక్కడి నుండి మీ Android ఫోన్‌కు నంబర్‌ను పంపడానికి, రెండు పరికరాలలోని Chromiumకు సైన్ ఇన్ చేయండి. ఈ ఎక్స్‌టెన్షన్‌ మీరు Chromiumని ప్రారంభించినప్పుడు చూపబడే పేజీని మార్చింది. +కొనసాగించు ఎక్స్‌టెన్షన్‌ మీరు Chromiumని ప్రారంభించినప్పుడు చూపబడే పేజీని మార్చింది. ఈ సైట్ కోసం Chromiumకు కెమెరా, ఇంకా మైక్రోఫోన్ అనుమతులు అవసరం Chromiumలో @@ -108,6 +109,7 @@ ఏదేమైనా Chromium నుండి నిష్క్రమించాలా? నేపథ్యంలో అమలయ్యేందుకు Chromiumని అనుమతించండి Chromiumను అనుకూలీకరించండి మరియు నియంత్రించండి +ఫిషింగ్, అలాగే మాల్‌వేర్‌ను బ్లాక్ చేయడానికి మెరుగుపరచిన రక్షణ మరింత చేయగలదు Chromiumకు స్వాగతం; కొత్త బ్రౌజర్ విండో తెరవబడింది Chromium అప్‌డేట్ అవ్వలేదు, ఏదో తప్పు జరిగింది. Chromium అప్‌డేట్ సమస్యలు, విఫలమైన అప్‌డేట్‌లను పరిష్కరించండి. కొత్త Chromium ప్రొఫైల్‌లో కొనసాగించాలా? diff --git a/chrome/app/resources/chromium_strings_th.xtb b/chrome/app/resources/chromium_strings_th.xtb index 1005aacfc4d961..6af4f1cc314488 100644 --- a/chrome/app/resources/chromium_strings_th.xtb +++ b/chrome/app/resources/chromium_strings_th.xtb @@ -34,6 +34,7 @@ ตรวจสอบ URL กับรายการเว็บไซต์ที่ไม่ปลอดภัยซึ่งจัดเก็บไว้ใน Chromium หากเว็บไซต์พยายามขโมยรหัสผ่าน หรือคุณดาวน์โหลดไฟล์ที่เป็นอันตราย Chromium อาจส่ง URL รวมถึงเนื้อหาบางส่วนในหน้าไปยัง Google Safe Browsing ด้วย หากต้องการส่งหมายเลขจากที่นี่ไปยังโทรศัพท์ Android ให้ลงชื่อเข้าใช้ Chromium ในอุปกรณ์ทั้งสองเครื่อง ส่วนขยายนี้ได้เปลี่ยนหน้าที่จะแสดงเมื่อคุณเริ่มต้น Chromium +ต่อไป ส่วนขยาย "" ได้เปลี่ยนหน้าที่จะแสดงเมื่อคุณเริ่มต้น Chromium Chromium ต้องการสิทธิ์เข้าถึงกล้องและไมโครโฟนสำหรับเว็บไซต์นี้ ใน Chromium @@ -110,6 +111,7 @@ ออกจาก Chromium ใช่ไหม ให้ Chromium ทำงานในพื้นหลัง กำหนดค่าและควบคุม Chromium +การปกป้องที่ปรับปรุงแล้วทำได้มากกว่าบล็อกฟิชชิงและมัลแวร์ ยินดีต้อนรับสู่ Chromium เปิดหน้าต่างเบราวเซอร์ใหม่แล้ว Chromium ไม่ได้อัปเดตเนื่องจากเกิดข้อผิดพลาด โปรดแก้ปัญหาการอัปเดต Chrome และการอัปเดตที่ไม่สำเร็จ ดำเนินการต่อในโปรไฟล์ Chromium ใหม่ไหม @@ -224,6 +226,7 @@ Chromium ไม่สามารถกู้คืนการตั้งค หน้าต่างใหม่ เว็บของคุณ บุ๊กมาร์ก และข้อมูลอื่นๆ ใน Chromium พร้อมใช้แล้วที่นี่ ผู้ดูแลระบบได้กำหนดค่าให้ Chromium เปิด เพื่อเข้าถึง +เปิดใน Chromium ด้วยไหม โปรไฟล์ Chromium ช่วยให้คุณแยกข้อมูลต่างๆ ใน Chromium ได้ ซึ่งทำให้แยกการทำงานออกจากความบันเทิงได้ง่ายขึ้น รีสตาร์ท Chromium OS - Chromium Dev diff --git a/chrome/app/resources/chromium_strings_tr.xtb b/chrome/app/resources/chromium_strings_tr.xtb index 5b9f6187234bb2..f0594c75ac950a 100644 --- a/chrome/app/resources/chromium_strings_tr.xtb +++ b/chrome/app/resources/chromium_strings_tr.xtb @@ -34,6 +34,7 @@ URL'leri, Chromium'da kayıtlı güvenli olmayan siteler listesine göre kontrol eder. Chromium, bir sitenin şifrenizi çalmaya çalışması veya zararlı bir dosya indirmeniz halinde de Güvenli Tarama'ya sayfa içeriğinden parçalarla birlikte URL'ler gönderebilir. Buradan Android telefonunuza numara göndermek için iki cihazdan da Chromium'da oturum açın. Bu uzantı, Chromium'u başlattığınızda gösterilen sayfayı değiştirdi. +Devam et "" uzantısı, Chromium'u başlattığınızda gösterilen sayfayı değiştirdi. Bu site için Chromium'un kamera ve mikrofon izinlerine ihtiyacı var Chromium'da @@ -108,6 +109,7 @@ Yine de Chromium'dan çıkılsın mı? Chromium'un Arka Planda Çalışmasına İzin Ver Chromium'u özelleştirin ve kontrol edin +Gelişmiş koruma, kimlik avını ve kötü amaçlı yazılımları engellemek için daha fazla özellik sunar Chromium'a hoş geldiniz; yeni tarayıcı penceresi açıldı Chromium güncellenmedi. Bir sorun oluştu. Chrome güncelleme sorunlarını ve başarısız güncellemeleri düzeltin. Yeni bir Chromium profilinde devam edilsin mi? diff --git a/chrome/app/resources/chromium_strings_uk.xtb b/chrome/app/resources/chromium_strings_uk.xtb index f28b66ca618694..a77e3fdb454c8c 100644 --- a/chrome/app/resources/chromium_strings_uk.xtb +++ b/chrome/app/resources/chromium_strings_uk.xtb @@ -34,6 +34,7 @@ Перевіряє URL-адреси за списком шкідливих сайтів, що зберігаються в Chromium. Якщо сайт намагається викрасти ваш пароль або ви завантажуєте шкідливий файл, Chromium також може надсилати в Безпечний перегляд URL-адреси, зокрема уривки контенту сторінки. Щоб надіслати номер на телефон Android, увійдіть у Chromium на обох пристроях. Це розширення змінило сторінку, яка відкривається під час запуску Chromium. +Продовжити Розширення "" змінило сторінку, яка відкривається під час запуску Chromium. Веб-переглядачу Chromium потрібен доступ до камери та мікрофона для цього сайту У Chromium @@ -110,6 +111,7 @@ Усе одно вийти з Chromium? Дозволити Chromium працювати у фоновому режимі Налаштування та керування Chromium +Покращений захист ще ефективніше блокує фішинг і зловмисне програмне забезпечення Вітаємо в Chromium! Відкрито нове вікно веб-переглядача Не вдалось оновити веб-переглядач Chromium. Вирішіть проблеми з оновленням Chrome. Продовжити в новому профілі Chromium? diff --git a/chrome/app/resources/chromium_strings_ur.xtb b/chrome/app/resources/chromium_strings_ur.xtb index 9dd1f52d672876..756db2201b118b 100644 --- a/chrome/app/resources/chromium_strings_ur.xtb +++ b/chrome/app/resources/chromium_strings_ur.xtb @@ -36,6 +36,7 @@ ‏Chromium میں اسٹور کردہ غیر محفوظ سائٹس کی فہرست کے URLs چیک کرتا ہے۔ اگر کوئی سائٹ آپ کا پاس ورڈ چرانے کی کوشش کرتی ہے یا جب آپ نقصان دہ فائل ڈاؤن لوڈ کرتے ہیں تو Chromium محفوظ براؤزنگ پر صفحہ کے مواد کے بائٹس سمیت URLs بھیجتا ہے۔ ‏یہاں سے اپنے Android فون پر نمبر بھیجنے کے لیے، دونوں آلات پر Chromium میں سائن ان کریں۔ ‏آپ کی جانب سے Chromium شروع کرنے پر دکھائی دینے والے صفحہ کو اس ایکسٹینشن نے تبدیل کر دیا ہے۔ +جاری رکھیں ‏آپ کی جانب سے Chromium شروع کرنے پر دکھائی دینے والے صفحہ کو ایکسٹینشن "" نے تبدیل کر دیا ہے۔ ‏Chromium کو اس سائٹ کے لیے کیمرے اور مائیکروفون کی اجازتیں درکار ہیں ‏Chromium میں @@ -112,6 +113,7 @@ ‏بہر حال Chromium کو بند کریں؟ ‏Chromium کو پس منظر میں چلنے دیں ‏Chromium کو حسب ضرورت بنائیں اور کنٹرول کریں +فریب دہی اور میلوئیر کو مسدود کرنے کیلئے بہتر کردہ حفاظت مزید کام کرتی ہے ‏Chromium میں آپ کا استقبال ہے، براؤزر کی نئی ونڈو کھلی ‏Chromium اپ ڈیٹ نہیں ہوا، کچھ غلط ہو گیا۔ Chrome اپ ڈیٹ کی دشواریوں اور ناکام اپ ڈیٹس کو درست کریں۔ ‏ایک نئی Chromium پروفائل میں جاری رکھیں؟ diff --git a/chrome/app/resources/chromium_strings_uz.xtb b/chrome/app/resources/chromium_strings_uz.xtb index 306e9e3311ea13..99f5079ed38984 100644 --- a/chrome/app/resources/chromium_strings_uz.xtb +++ b/chrome/app/resources/chromium_strings_uz.xtb @@ -34,6 +34,7 @@ URL manzillar Chromium bilgan zararli saytlar roʻyxati orqali tekshiriladi. Agar sayt parolingizni oʻgirlashga urinsa yoki zararli fayl yuklab olsangiz, Chromium ham URL manzillar kabi sahifa elementlarini Saytlarni xavfsiz kezish tizimiga yuborishi mumkin. Bu yerdan Android telefoningizga raqam yuborish uchun ikkala qurilmada Chromium hisobingizga kiring. Bu kengaytma Chromium ishga tushganda ko‘rinadigan sahifani o‘zgartirdi. +Davom etish ” kengaytmasi Chromium ishga tushganda ko‘rinadigan sahifani o‘zgartirdi. Chromium bu saytda kamera va mikrofondan foydalanishiga ruxsat kerak Chromium brauzerida @@ -106,8 +107,10 @@ Chromium yordam markazi Noma’lum xatolik tufayli o‘rnatish amalga oshmadi. Agar hozirda Chromium ishlab turgan bo‘lsa, iltimos brauzeringizni yoping va qaytadan urinib ko‘ring. Chromium baribir yopilsinmi? +Chromium muhim deb hisoblagan maxfiylik parametrlarini moslang. Bu qoʻllanmada barcha sozlama va parametrlar koʻrsatilmagan. Chromium fonda ishlashiga ruxsat Chromium’ni sozlash va boshqarish +Kengaytirilgan himoya fishing va zararli dasturlarni bloklaydi Chromium brauzeriga xush kelibsiz, yangi oyna ochildi Notanish xatolik tufayli Chromium yangilanmadi. Chromiumdagi yangilanish muammolari va xatoliklarni tuzatish. Yangi Chromium profilida davom etasizmi? @@ -293,5 +296,6 @@ Chromium sozlamalaringizni qaytadan tiklay olmadi. Chromium OS tizimi Chromium brauzeri Windows XP yoki Windows Vista tizimlarida ishlamay qolishi mumkin, chunki uning yangi versiyalarida bu tizimlar ta’minoti to‘xtatiladi Chromiumni kim ochdi? +Chromium brauzerining kuchli xavfsizligidan foydalaning Chromium mualliflari \ No newline at end of file diff --git a/chrome/app/resources/chromium_strings_vi.xtb b/chrome/app/resources/chromium_strings_vi.xtb index 39f43cb087572f..3dbd9d07696f38 100644 --- a/chrome/app/resources/chromium_strings_vi.xtb +++ b/chrome/app/resources/chromium_strings_vi.xtb @@ -34,6 +34,7 @@ Kiểm tra đối chiếu các URL với danh sách trang web không an toàn được lưu trữ trong Chromium. Nếu một trang web cố ăn cắp mật khẩu của bạn hoặc nếu bạn tải một tệp gây hại xuống, thì Chrome cũng có thể gửi các URL đến tính năng Duyệt web an toàn, bao gồm cả các đoạn nội dung trên trang. Để gửi số điện thoại từ thiết bị này đến điện thoại Android của bạn, hãy đăng nhập vào Chromium trên cả hai thiết bị. Tiện ích này đã thay đổi trang nào được hiển thị khi bạn khởi động Chromium. +Tiếp tục Tiện ích "" đã thay đổi trang nào được hiển thị khi bạn khởi động Chromium. Chromium cần có quyền truy cập máy ảnh và micrô đối với trang web này Trong Chromium @@ -110,6 +111,7 @@ Bạn vẫn muốn thoát khỏi Chromium? Cho phép Chromium chạy trong nền Tùy chỉnh và điều khiển Chromium +Chế độ bảo vệ tăng cường giúp chặn phần mềm độc hại và hành vi lừa đảo hiệu quả hơn Chào mừng bạn đến với Chromium. Cửa sổ trình duyệt mới đã mở ra Đã xảy ra lỗi nên Chromium chưa cập nhật được. Hãy khắc phục các vấn đề cập nhật và các bản cập nhật không thành công của Chromium. Tiếp tục đăng nhập vào hồ sơ mới trên Chromium? diff --git a/chrome/app/resources/chromium_strings_zh-CN.xtb b/chrome/app/resources/chromium_strings_zh-CN.xtb index 2e175aa5bad2b1..ae34fcd8ae48a2 100644 --- a/chrome/app/resources/chromium_strings_zh-CN.xtb +++ b/chrome/app/resources/chromium_strings_zh-CN.xtb @@ -34,6 +34,7 @@ 将网址与存储在 Chromium 中的不安全网站列表进行比对。如果某个网站企图窃取您的密码,或者您下载了有害的文件,Chromium 可能还会将相应网址连同少量网页内容发送给“安全浏览”功能。 若要从此处向您的 Android 手机发送电话号码,请在这两部设备上分别登录 Chromium。 此扩展程序更改了 Chromium 启动后系统显示的页面。 +继续 ”扩展程序更改了 Chromium 启动后系统显示的页面。 Chromium 需要为此网站授予摄像头权限和麦克风权限 在 Chromium 中 @@ -110,6 +111,7 @@ 仍要退出 Chromium? 让 Chromium 在后台运行 自定义及控制 Chromium +“增强型保护”选项在防范网上诱骗和恶意软件方面更高一筹 欢迎使用 Chromium;已打开新的浏览器窗口 Chromium 未能更新,因为出了点问题。请解决导致 Chromium 更新失败的问题 使用一份新的 Chromium 个人资料继续浏览? diff --git a/chrome/app/resources/chromium_strings_zh-HK.xtb b/chrome/app/resources/chromium_strings_zh-HK.xtb index 47feb343650873..307209859d5c22 100644 --- a/chrome/app/resources/chromium_strings_zh-HK.xtb +++ b/chrome/app/resources/chromium_strings_zh-HK.xtb @@ -36,6 +36,7 @@ 使用儲存在 Chromium 中的不安全網站清單來檢查網址。如果有網站試圖盜取您的密碼,或當您下載有害檔案時,Chromium 亦可能將網址 (包括部分網頁內容) 傳送至「安全瀏覽」功能。 如要將號碼從此處傳送至 Android 手機,請在這兩部裝置上登入 Chromium。 擴充功能已變更 Chromium 啟動時所顯示的網頁。 +繼續 擴充功能「」已變更 Chromium 啟動時所顯示的網頁。 Chromium 需要相機權限和麥克風權限,才能執行此網站要求的功能 在 Chromium 中 @@ -112,6 +113,7 @@ 仍要結束 Chromium 嗎? 讓 Chromium 在背景執行 自訂及控制 Chromium +強化保護功能可進一步封鎖仿冒詐騙和惡意軟件 歡迎使用 Chromium;開咗新瀏覽器視窗 發生錯誤,Chromium 未能更新。請修正 Chromium 更新問題與更新失敗問題。 要透過新的 Chromium 設定檔繼續瀏覽嗎? @@ -226,6 +228,7 @@ Chromium 無法復原您的設定。 新視窗 您瀏覽的網頁、書籤和其他 Chromium 內容都在這裡。 系統管理員已設定由 Chromium 開啟 以存取 +要一併在 Chromium 中開啟這項功能嗎? 透過 Chromium 設定檔,您可將所有 Chromium 內容分門別類,從而更輕易劃分工作和娛樂內容。 重新啟動 Chromium 作業系統 - Chromium 開發人員版 diff --git a/chrome/app/resources/chromium_strings_zh-TW.xtb b/chrome/app/resources/chromium_strings_zh-TW.xtb index 19343d3cb3c8f9..a6981fdbe7f1c4 100644 --- a/chrome/app/resources/chromium_strings_zh-TW.xtb +++ b/chrome/app/resources/chromium_strings_zh-TW.xtb @@ -34,6 +34,7 @@ 可使用儲存在 Chromium 中的不安全網站清單檢查網址。如果有網站試圖竊取你的密碼,或當你下載有害檔案時,Chromium 可能也會將網址 (包括部分網頁內容) 傳送給安全瀏覽功能。 如要將號碼從這裡傳送到 Android 手機,請在這兩部裝置上登入 Chromium。 這個擴充功能已變更 Chromium 啟動時所顯示的網頁。 +繼續 擴充功能「」已變更 Chromium 啟動時所顯示的網頁。 Chromium 需要相機權限和麥克風權限,才能執行這個網站要求的功能 在 Chromium 中 @@ -110,6 +111,7 @@ 確定要結束 Chromium 嗎? 讓 Chromium 在背景執行 自訂及控制 Chromium +強化防護功能可進一步封鎖網路詐騙和惡意軟體 歡迎使用 Chromium;新的瀏覽器視窗已開啟 發生錯誤,Chromium 未能更新。請修正 Chromium 更新問題與更新失敗項目。 要繼續使用新的 Chromium 設定檔嗎? @@ -224,6 +226,7 @@ Chromium 無法復原你的設定。 新視窗 你瀏覽的網頁、書籤和其他 Chromium 設定都在這裡。 你的系統管理員已設定由 Chromium 開啟 以存取 +要一併在 Chromium 中開啟這項功能嗎? 你可以運用 Chromium 設定檔區隔各種 Chromium 資料,更輕鬆區分工作和娛樂。 重新啟動 Chromium 作業系統 - Chromium 開發人員版 diff --git a/chrome/app/resources/chromium_strings_zu.xtb b/chrome/app/resources/chromium_strings_zu.xtb index 929af883e57354..b4c4ee66f18245 100644 --- a/chrome/app/resources/chromium_strings_zu.xtb +++ b/chrome/app/resources/chromium_strings_zu.xtb @@ -36,6 +36,7 @@ Ezinye izici kungenzeka zingabi khona futhi izinguquko kokuncamelayo ngeke zize Kuhlola ama-URL anohlu lwamasayithi angaphephile agcinwe ku-Chromium. Uma isayithi lizama ukuntshontsha iphasiwedi yakho, noma uma ulanda ifayela eliyingozi, i-Chromium ingathumela nama-URL, kuhlanganise nokuthile okuqukethwe kulelo khasi, Ekuphequluleni Okuphephile. Ukuze uthumele inombolo kusukela lapha kufoni yakho ye-Android, ngena ngemvume ku-Chromium kuwo womabili amadivayisi. Lesi sandiso siguqule ukuthi yiliphi ikhasi eliboniswayo uma uqala i-Chromium. +Qhubeka Isandiso esingu-"" siguqule ukuthi yiliphi ikhasi eliboniswayo uma uqala i-Chromium. I-Chromium idinga izimvume zekhamera nemakrofoni kule sayithi Ku-Chromium @@ -112,6 +113,7 @@ Ezinye izici kungenzeka zingabi khona futhi izinguquko kokuncamelayo ngeke zize Phuma ku-Chromium noma kunjalo? Vumela i-Chromium isebenze ngemuva Yenza ngokwezifiso uphinde ulawule i-Chromium +Isivikelo esithuthukisiwe senza okuningi ukuvimba ubugebengu bokweba imininingwane ebucayi kanye uhlelo olungayilungele ikhompyutha Siyakwamukela ku-Chromium; iwindi elisha lesiphequluli livuliwe I-Chromium ayibuyekezekanga, kunokuthile okungahambanga kahle. Lungisa izinkinga zokubuyekaza kwe-Chromium nezibuyekezo ezihlulekile. Qhubeka kuphrofayela entsha ye-Chromium? diff --git a/chrome/app/resources/generated_resources_af.xtb b/chrome/app/resources/generated_resources_af.xtb index ce05e755485f3c..b82d66323eb47a 100644 --- a/chrome/app/resources/generated_resources_af.xtb +++ b/chrome/app/resources/generated_resources_af.xtb @@ -1742,7 +1742,6 @@ en Ctrl+Alt+Verlaag Helderheid om uit te zoem Nie na die tyd nie Ontfout Verander jou toeganklikheidinstellings -Gaan my instellings na Ingeduik OK Maak terugstellingterminaal oop @@ -1871,7 +1870,6 @@ en Ctrl+Alt+Verlaag Helderheid om uit te zoem Stel jou profielfoto Skermkiekie van programme wat tans op die skerm is Gaan tans kragbronne na … -Privaatheidkontrolering Maak as vasgespelde oortjie oop Hierdie uitbreiding is verouderd en volgens ondernemingsbeleid gedeaktiveer. Dit kan outomaties geaktiveer word wanneer 'n nuwer weergawe beskikbaar is. Werf @@ -2419,7 +2417,6 @@ en Ctrl+Alt+Verlaag Helderheid om uit te zoem Begin Parallels Desktop om Windows te installeer. Lees jou data op 'n aantal webwerwe Hierdie lêer het sensitiewe inhoud -Verstaan en gaan die mees kritieke privaatheidinstellings op een plek na Blokkeer alle derdepartywebkoekies Google Chrome en Chrome-bedryfstelsel se bykomende bepalings Dateer rekening op @@ -3351,6 +3348,7 @@ en Ctrl+Alt+Verlaag Helderheid om uit te zoem Stel instellings terug , jou administrateur vereis dat jy jou wagwoord verander. Om te begin, moet jy asseblief seker maak dat jou USB- of Bluetooth-skakelaar aan jou Chromebook gekoppel is. Jy kan ook sleutelbordsleutels gebruik. +Verbeterde beskerming doen meer om uitvissing en wanware te blokkeer Verifieer tans bevestigingkode … Fisieke sleutelborduitleg Volume diff --git a/chrome/app/resources/generated_resources_am.xtb b/chrome/app/resources/generated_resources_am.xtb index e36626ffc8a1f3..341a489527c0e3 100644 --- a/chrome/app/resources/generated_resources_am.xtb +++ b/chrome/app/resources/generated_resources_am.xtb @@ -1736,7 +1736,6 @@ ከኋላ ያለሆነ አርም የተደራሽነት ቅንብሮችዎን ይቀይራል -ቅንብሮቼን ገምግም የተደበረ እሺ የመልሶ ማግኛ ተርሚናል ክፈት @@ -1865,7 +1864,6 @@ የእርስዎን የመገለጫ ሥዕል ያቀናብሩ በአሁኑ ጊዜ በማያ ገጹ ላይ ያሉ የፕሮግራሞች ቅጽበታዊ ገጽ እይታ የኃይል ምንጮች በመፈተሽ ላይ... -የግላዊነት ግምገማ እንደተሰካ ትር ክፈት ይህ ቅጥያ ጊዜው ያለፈበት እና በድርጅት መመሪያ የተሰናከለ ነው። ይበልጥ አዲስ የሆነ ስሪት ሲገኝ በራስ-ሰር ሊነቃ ይችላል። ጣቢያ @@ -2413,7 +2411,6 @@ Windowsን ለመጫን እባክዎ Parallels ዴስክቶፕን ያስጀምሩ። የእርስዎን ውሂብ በበርካታ የድር ጣቢያዎች ላይ ያንብቡ ይህ ፋይል ሚስጥራዊነት ይያለው ይዘት አለው -በጣም አሳሳቢ የግላዊነት ቅንብሮችን በአንድ ቦታ ይረዱ እና ይገምግሙ ሁሉንም የሶስተኛ ወገን ኩኪዎችን አግድ የGoogle Chrome እና የChrome OS ተጨማሪ ደንቦች መለያን አዘምን @@ -3343,6 +3340,7 @@ ቅንብሮችን ወደነበሩበት መልስ ፣ የእርስዎ አስተዳዳሪ የይለፍ ቃልዎን እንዲቀይሩ ይፈልግብዎታል። ለመጀመር እባክዎ የእርስዎ ዩኤስቢ ወይም የብሉቱዝ መቀየሪያ ከእርስዎ Chromebook ጋር መገናኘቱን ያረጋግጡ። እንዲሁም የቁልፍ ሰሌዳ ቁልፎችን መጠቀም ይችላሉ። +የተሻሻለ ጥበቃ ማስገር እና ተንኮል-አዘል ዌር ለማገድ የበለጠ ይሠራል የማረጋገጫ ኮድ በማረጋገጥ ላይ... የአካላዊ ቁልፍ ሰሌዳ አቀማመጥ ድምፅ diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb index 849db6df1de107..fcb23d3e7c64e9 100644 --- a/chrome/app/resources/generated_resources_ar.xtb +++ b/chrome/app/resources/generated_resources_ar.xtb @@ -1731,7 +1731,6 @@ آخر يوم للصلاحية تصحيح الأخطاء تغيير إعدادات إمكانية الوصول -مراجعة الإعدادات منخفضة حسنًا فتح الوحدة الطرفية للاسترداد @@ -1861,7 +1860,6 @@ تعيين صورة الملف الشخصي لقطة شاشة للبرامج التي تظهر على الشاشة حاليًا جارٍ التحقق من مصادر الطاقة... -مراجعة الخصوصية فتح كعلامة تبويب مثبتة تعتبر هذه الإضافة قديمة وغير مفعّلة بواسطة سياسة المؤسسة. وقد تصبح مفعّلة تلقائيًا عندما يتوفر إصدار أحدث. الموقع @@ -2410,7 +2408,6 @@ ‏يُرجى تشغيل نظام Parallels Desktop لتثبيت نظام التشغيل Windows. قراءة بياناتك على عدد من المواقع الإلكترونية هذا الملف به محتوى حسّاس. -فهم الإعدادات المُهمّة للخصوصية ومراجعتها من مكان واحد حظر جميع ملفات تعريف الارتباط للأطراف الثالثة ‏بنود الخدمة الإضافية لكلٍّ من متصفّح Google Chrome و"نظام التشغيل Chrome" تحديث الحساب @@ -3339,6 +3336,7 @@ استعادة الإعدادات يا ، يطلب منك مشرفك تغيير كلمة المرور. ‏للبدء، يُرجى التأكُّد من توصيل مفتاح تبديل يعمل باستخدام USB أو بلوتوث بجهاز Chromebook. ويمكنك أيضًا استخدام مفاتيح لوحة المفاتيح. +يؤدي تفعيل إعداد "الحماية المُحسَّنة" إلى حظر التصيّد الاحتيالي والبرامج الضارّة. جارٍ التحقّق من رمز تأكيد البيانات... تنسيق لوحة المفاتيح الفعلية مستوى الصوت diff --git a/chrome/app/resources/generated_resources_as.xtb b/chrome/app/resources/generated_resources_as.xtb index 046b64a4bf8347..7b92e98654c278 100644 --- a/chrome/app/resources/generated_resources_as.xtb +++ b/chrome/app/resources/generated_resources_as.xtb @@ -1735,7 +1735,6 @@ ইয়াৰ পাছত নহয় ডিবাগ আপোনাৰ সাধ্য সুবিধাৰ ছেটিং সলনি কৰক -মোৰ ছেটিং পৰ্যালোচনা কৰক পোটোকা পৰা ঠিক আছে পুনৰুদ্ধাৰৰ টাৰ্মিনেল খোলক @@ -1864,7 +1863,6 @@ আপোনাৰ প্ৰ'ফাইলৰ চিত্ৰ ছেট কৰক স্ক্রীনখনত বৰ্তমান থকা প্ৰ’গ্ৰামসমূহৰ স্ক্ৰীনশ্বট পাৱাৰ উৎসসমূহ নিৰীক্ষণ কৰি থকা হৈছে... -গোপনীয়তাৰ পৰ্যালোচনা পিন কৰি থোৱা টেব হিচাপে খোলক এই এক্সটেনশ্বনটো পুৰণি হৈছে আৰু এণ্টাৰপ্ৰাইজৰ নীতি অনুসৰি অক্ষম কৰা হৈছে। নতুন সংস্কৰণ উপলব্ধ হ’লে এইটো স্বয়ংক্ৰিয়ভাৱে সক্ষম কৰা হ’ব। ছাইট @@ -2410,7 +2408,6 @@ Windows ইনষ্টল কৰিবলৈ অনুগ্ৰহ কৰি Parallels Desktop লঞ্চ কৰক। আপোনাৰ ডেটা ৱেবছাইটসমূহত পঢ়ে এই ফাইলটোত সংবেদনশীল সমল আছে -একেঠাইতে আটাইতকৈ গুৰুত্বপূৰ্ণ গোপনীয়তাৰ ছেটিংসমূহৰ বিষয়ে বুজি পাওক আৰু সেইবোৰ পৰ্যালোচনা কৰক আটাইবোৰ তৃতীয় পক্ষৰ কুকি অৱৰোধ কৰক Google Chrome আৰু Chrome OSৰ অতিৰিক্ত চৰ্তাৱলী একাউণ্ট আপডে'ট কৰক @@ -3340,6 +3337,7 @@ ছেটিংসমূহ পুনঃস্থাপন কৰক , আপোনাৰ প্ৰশাসকে আপুনি নিজৰ পাছৱৰ্ডটো সলনি কৰাটো বিচাৰে। আৰম্ভ কৰিবলৈ, অনুগ্ৰহ কৰি আপোনাৰ ইউএছবি অথবা ব্লুটুথ ছুইচটো নিজৰ Chromebookৰ সৈতে সংযোগ হৈ থকাটো নিশ্চিত কৰক। আপুনি কীব'ৰ্ডৰ কীসমূহো ব্যৱহাৰ কৰিব পাৰে। +বৰ্ধিত সুৰক্ষাৰ সুবিধাটোৱে ফিশ্বিং আৰু মালৱেৰ অৱৰোধ কৰিবলৈ অধিক কাৰ্য কৰে নিশ্চিতকৰণৰ ক'ড সত্যাপন কৰি থকা হৈছে... কায়িক কীব’ৰ্ডৰ লে’আউট ভলিউম diff --git a/chrome/app/resources/generated_resources_az.xtb b/chrome/app/resources/generated_resources_az.xtb index 19d6fac545072a..0daf726ae4ba7d 100644 --- a/chrome/app/resources/generated_resources_az.xtb +++ b/chrome/app/resources/generated_resources_az.xtb @@ -1725,7 +1725,6 @@ Cihazda Family Link tətbiqini quraşdırmaqla bu hesabın ayarlarını idarə e Sonra yox Debaq Əlçatımlıq ayarlarını dəyişin -Ayarlarımı nəzərdən keçirin Kədərli Ok Bərpa terminalını açın @@ -1854,7 +1853,6 @@ Cihazda Family Link tətbiqini quraşdırmaqla bu hesabın ayarlarını idarə e Profil şəkli ayarlayın Hazırda ekranda olan proqramların ekran şəkli Enerji mənbələri yoxlanılır... -Məxfiliyin nəzərdən keçirilməsi VACİB Tab Açıq Bu artırma köhnədir və müəssisə siyasəti tərəfindən deaktiv edildi. Yeni versiya əlçatan olanda avtomatik aktiv edilə bilər. Sayt @@ -2402,7 +2400,6 @@ Cihazda Family Link tətbiqini quraşdırmaqla bu hesabın ayarlarını idarə e Windows'u quraşdırmaq üçün Parallels Desktop'u işə salın. Datanızı çoxsaylı vebsaytda oxuyun Bu fayl həssas məzmun ehtiva edir -Ən kritik məxfilik ayarlarını bir yerdə anlayın və nəzərdən keçirin Bütün üçüncü tərəf kukilərini bloklayın Google Chrome və Chrome ƏS üzrə Əlavə Şərtlər Hesabı yeniləyin @@ -3332,6 +3329,7 @@ Cihazda Family Link tətbiqini quraşdırmaqla bu hesabın ayarlarını idarə e Ayarları Bərpa Edin , administrator parolu dəyişməyinizi tələb edir. Başlamaq üçün USB və ya Bluetooth keçiricinizin Chromebook'unuza qoşulduğuna əmin olun. Klaviatura düymələrindən də istifadə edə bilərsiniz. +Təkmil qoruma ilə fişinq və zərərli proqramların bloklanması üçün daha çox iş görülür Təsdiq kodu doğrulanır... Fiziki klaviatura düzəni Həcm diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb index 28c83dae00e6e9..13e4198956637c 100644 --- a/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb @@ -1725,7 +1725,6 @@ Не пазней Адладзіць Змяніць налады спецыяльных магчымасцей -Праглядзець мае налады Уціснуты OK Адкрыць тэрмінал аднаўлення @@ -1854,7 +1853,6 @@ Задайце сваё фота профілю Здымак экрана з праграмамі Ідзе праверка крыніц сілкавання... -Праверка налад прыватнасці Адкрыць у замацаванай укладцы Гэта пашырэнне састарэлае, яно выключана ў адпаведнасці з карпаратыўнай палітыкай. Пры даступнасці новай версіі пашырэнне можа быць уключана аўтаматычна. Сайт @@ -2400,7 +2398,6 @@ Каб усталяваць Windows, запусціце Parallels Desktop. Прагляд вашых даных на шэрагу вэб-сайтаў Гэты файл змяшчае канфідэнцыяльнае змесціва. -Самыя важныя налады прыватнасці на адной старонцы Блакіроўка ўсіх старонніх файлаў cookie Дадатковыя ўмовы Google Chrome і Chrome OS Абнавіць уліковы запіс @@ -3331,6 +3328,7 @@ Аднавіць налады , ваш адміністратар патрабуе, каб вы змянілі пароль. Перш чым пачаць работу, пераканайцеся, што да прылады Chromebook падключаны пераключальнік USB або Bluetooth. Вы можаце таксама выкарыстоўваць клавішы клавіятуры. +Функцыя палепшанай абароны яшчэ надзейней блакіруе фішынг і шкодныя праграмы Ідзе спраўджанне кода пацвярджэння... Раскладка фізічнай клавіятуры Гучнасць diff --git a/chrome/app/resources/generated_resources_bg.xtb b/chrome/app/resources/generated_resources_bg.xtb index 5f3e6fc44abbca..aa5a229e7682b5 100644 --- a/chrome/app/resources/generated_resources_bg.xtb +++ b/chrome/app/resources/generated_resources_bg.xtb @@ -1734,7 +1734,6 @@ Не след Отстраняване на грешки Промяна на настройките ви за достъпност -Преглед на настройките ми Снижена OK Отваряне на терминален прозорец за възстановяване @@ -1863,7 +1862,6 @@ Задаване на снимката на потребителския ви профил Екранна снимка на програмите на екрана Източниците на захранване се проверяват... -Преглед на настройките за поверителност Отваряне като фиксиран раздел Това разширение не е актуално и е деактивирано от корпоративно правило. Може да бъде активирано автоматично, когато бъде налице по-нова версия. Сайт @@ -2409,7 +2407,6 @@ Моля, стартирайте Parallels Desktop, за да инсталирате Windows. Четене на данните ви от редица уебсайтове В този файл има деликатно съдържание -Прегледайте най-важните настройки за поверителност и научете повече за тях на едно място Блокиране на всички „бисквитки“ на трети страни Допълнителни условия на Google Chrome и Chrome OS Актуализиране на профила @@ -3341,6 +3338,7 @@ Възстановяване на настройките , администраторът ви изисква да промените паролата си. За да започнете, превключвателят ви с USB или Bluetooth трябва да е свързан с вашия Chromebook. Можете да използвате и клавишите на клавиатурата. +Режимът за подобрена защита предприема повече действия за блокиране на фишинг атаки и злонамерен софтуер Кодът за потвърждение се проверява... Подредба на физическата клавиатура Звук diff --git a/chrome/app/resources/generated_resources_bn.xtb b/chrome/app/resources/generated_resources_bn.xtb index 9f649dcc5f133f..832b30d8426eee 100644 --- a/chrome/app/resources/generated_resources_bn.xtb +++ b/chrome/app/resources/generated_resources_bn.xtb @@ -1738,7 +1738,6 @@ এরপরে নয় ডিবাগ আপনার ব্যবহারযোগ্যতার সেটিংস পরিবর্তন করুন -আমার সেটিংস পর্যালোচনা করুন ভিতরের দিকে চাপা ঠিক আছে রিকভারি টার্মিনাল খুলুন @@ -1867,7 +1866,6 @@ আপনার প্রোফাইল ফটো সেট করুন স্ক্রিনে এখন যেসকল প্রোগ্রাম দেখা যাচ্ছে সেগুলির স্ক্রিনশট পাওয়ার সোর্স পরীক্ষা করা হচ্ছে... -গোপনীয়তা রিভিউ পিন করা ট্যাব হিসেবে খুলুন এই এক্সটেনশানটির পুরনো ভার্সনের এবং এন্টারপ্রাইজ নীতি বন্ধ করা রয়েছে৷ যখনই নতুন ভার্সন উপলভ্য থাকবে তখন এটি স্বয়ংক্রিয়ভারে চালু হবে৷ সাইট @@ -2413,7 +2411,6 @@ Windows ইনস্টল করতে Parallels Desktop চালু করুন। কতগুলি ওয়েবসাইটে আপনার ডেটা পড়ে এই ফাইলে সংবেদনশীল কন্টেন্ট আছে -এক জায়গা থেকে সবথেকে গুরুত্বপূর্ণ গোপনীয়তা সেটিংস বুঝে নিয়ে তার পর্যালোচনা করুন সমস্ত তৃতীয়-পক্ষ কুকি অবরোধ করুন Google Chrome ও Chrome OS-এর অতিরিক্ত শর্তাবলী অ্যাকাউন্ট আপডেট করুন @@ -3343,6 +3340,7 @@ সেটিংস পুনরুদ্ধার করুন , আপনার প্রশাসক চায় যে আপনি আপনার পাসওয়ার্ড পরিবর্তন করুন। শুরু করতে আপনার Chromebook-এর সাথে USB বা ব্লুটুথ সুইচ কানেক্ট করা আছে কিনা ভাল করে দেখে নিন। আপনি কীবোর্ডের কী ব্যবহার করেও করতে পারেন। +ফিশিং ও ম্যালওয়্যার ব্লক করার ব্যাপারে উন্নত সুরক্ষা আরও সাহায্য করে কনফার্মেশন কোড যাচাই করা হচ্ছে... ফিজিক্যাল কীবোর্ড লেআউট ভলিউম diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb index 5f747fd8a7b357..9d106fe8a67773 100644 --- a/chrome/app/resources/generated_resources_bs.xtb +++ b/chrome/app/resources/generated_resources_bs.xtb @@ -1740,7 +1740,6 @@ Postavkama ovog računa možete upravljati instaliranjem aplikacije Family Link Ne poslije Otkloni pogrešku Promijeniti postavke pristupačnosti -Pregledaj moje postavke Utisnuto Uredu Otvorite terminal za oporavak @@ -1869,7 +1868,6 @@ Postavkama ovog računa možete upravljati instaliranjem aplikacije Family Link Postavite sliku profila Snimak ekrana programa koji su trenutno na ekranu. Provjeravanje izvora napajanja... -Pregled privatnosti Otvori kao zakačenu karticu Ova ekstenzija je zastarjela i onemogućena je pravilom preduzeća. Može se omogućiti automatski kada nova verzija postane dostupna. Web lokacija @@ -2417,7 +2415,6 @@ Domena zahtijeva da pametna kartica ostane umetnuta.Pokrenite Parallels Desktop da instalirate Windows. Čitati vaše podatke na nizu web lokacija U ovom fajlu postoji osjetljiv sadržaj -Shvatite i pregledajte najkritičnije postavke privatnosti na jednom mjestu Blokiraj sve kolačiće trećih strana Dodatni uslovi za Google Chrome i Chrome OS Ažuriraj račun @@ -3349,6 +3346,7 @@ Domena zahtijeva da pametna kartica ostane umetnuta.Vrati postavke , vaš administrator traži da promijenite svoju lozinku. Da započnete, provjerite je li USB ili Bluetooth prekidač povezan s Chromebookom. Možete koristiti i tipke na tastaturi. +Poboljšana zaštita vas još bolje čuva od krađe identiteta i zlonamjernog softvera Potvrđivanje koda za potvrdu... Raspored fizičke tastature Jačina zvuka diff --git a/chrome/app/resources/generated_resources_ca.xtb b/chrome/app/resources/generated_resources_ca.xtb index 05345a5313838b..e4695251ad2133 100644 --- a/chrome/app/resources/generated_resources_ca.xtb +++ b/chrome/app/resources/generated_resources_ca.xtb @@ -1722,7 +1722,6 @@ i Ctrl+Alt+disminueix la brillantor per reduir. No després Depura Canvia la configuració d'accessibilitat -Revisa la configuració Enfonsat D'acord Obre el terminal de recuperació @@ -1851,7 +1850,6 @@ i Ctrl+Alt+disminueix la brillantor per reduir. Estableix la teva foto de perfil Captura de pantalla de programes que hi ha en pantalla en aquests moments S'estan comprovant les fonts d'alimentació... -Revisió de la privadesa Obre com a pestanya fixada Aquesta extensió no està actualitzada i està desactivada per a la política d'empresa. És possible que s'activi de manera automàtica quan estigui disponible una versió nova. Lloc web @@ -2397,7 +2395,6 @@ i Ctrl+Alt+disminueix la brillantor per reduir. Inicia Parallels Desktop per instal·lar Windows. Llegir les dades d'una sèrie de llocs web Aquest fitxer inclou contingut sensible -Entén i revisa les opcions de configuració de privadesa més importants des d'un sol lloc Bloqueja totes les galetes de tercers Condicions addicionals de Google Chrome i Chrome OS Actualitza el compte @@ -3327,6 +3324,7 @@ i Ctrl+Alt+disminueix la brillantor per reduir. Restaura la configuració , l'administrador necessita que canviïs la contrasenya. Per començar, comprova que l'interruptor USB o Bluetooth estigui connectat al Chromebook. També pots utilitzar les tecles del teclat. +La protecció millorada és més efiçaç a l'hora de bloquejar la pesca de credencials i el programari maliciós S'està verificant el codi de confirmació... Disposició del teclat físic Volum diff --git a/chrome/app/resources/generated_resources_cs.xtb b/chrome/app/resources/generated_resources_cs.xtb index 4f9c3bbd353e7c..efa2df7d746379 100644 --- a/chrome/app/resources/generated_resources_cs.xtb +++ b/chrome/app/resources/generated_resources_cs.xtb @@ -1724,7 +1724,6 @@ Chcete-li spravovat nastavení tohoto účtu, nainstalujte si do zařízení apl Nikoli po Ladit Změnit nastavení přístupnosti -Zkontrolovat nastavení Ryté OK Otevřít terminál pro obnovení @@ -1853,7 +1852,6 @@ Chcete-li spravovat nastavení tohoto účtu, nainstalujte si do zařízení apl Nastavení profilové fotky Snímek obrazovky programů, které jsou aktuálně na obrazovce. Probíhá kontrola zdrojů napájení... -Kontrola ochrany soukromí Otevřít jako připnutou kartu Toto rozšíření je zastaralé a je zakázáno podnikovou zásadou. Možná bude opět automaticky povoleno, až bude k dispozici novější verze. Stránky @@ -2399,7 +2397,6 @@ Zpráva serveru: Pokud chcete nainstalovat systém Windows, spusťte nástroj Parallels Desktop. Čtení vašich dat na mnoha webech Obsah tohoto souboru je citlivý -Zkontrolujte většinu důležitých nastavení ochrany soukromí na jednom místě Blokovat všechny soubory cookie třetích stran Doplňující smluvní podmínky prohlížeče Google Chrome a systému Chrome OS Aktualizovat účet @@ -3329,6 +3326,7 @@ Zpráva serveru: Obnovit nastavení Zpráva pro uživatele : váš administrátor vyžaduje, abyste si změnili heslo. Na začátku je třeba mít přepínač USB nebo Bluetooth zapojený do Chromebooku. Můžete také použít klávesnici. +Vylepšená ochrana vás lépe ochrání před phishingem a malwarem Ověřování potvrzovacího kódu… Rozložení fyzické klávesnice Hlasitost diff --git a/chrome/app/resources/generated_resources_da.xtb b/chrome/app/resources/generated_resources_da.xtb index 5c6d086eb2d13c..d806c7ed5963bd 100644 --- a/chrome/app/resources/generated_resources_da.xtb +++ b/chrome/app/resources/generated_resources_da.xtb @@ -1739,7 +1739,6 @@ og tryk på Ctrl+Alt+lysstyrke ned for at zoome ud. Ikke efter Fejlretning Skift dine tilgængelighedsindstillinger -Gennemgå mine indstillinger Sænket OK Åbn terminal til gendannelse @@ -1868,7 +1867,6 @@ og tryk på Ctrl+Alt+lysstyrke ned for at zoome ud. Vælg profilbillede Screenshot af de programmer, der lige nu er på skærmen Tjekker strømkilder... -Gennemgang af privatliv Åbn som fastgjort fane Denne udvidelse er forældet og deaktiveret af virksomhedspolitikken. Den kan aktiveres automatisk, når en nyere version er tilgængelig. Website @@ -2414,7 +2412,6 @@ og tryk på Ctrl+Alt+lysstyrke ned for at zoome ud. Start Parallels Desktop for at installere Windows. Læs dine data på en række websites Denne fil har følsomt indhold -Forstå og gennemgå de vigtigste privatlivsindstillinger samlet på ét sted Bloker alle cookies fra tredjeparter Yderligere vilkår for Google Chrome og Chrome OS Opdater konto @@ -3345,6 +3342,7 @@ Vil du starte ? Gendan indstillinger , din administrator kræver, at du ændrer din adgangskode. Kom godt i gang ved at tjekke, at din USB- eller Bluetooth-kontakt har forbindelse til din Chromebook. Du kan også bruge tasterne på et tastatur. +Forbedret beskyttelse gør mere end at blokere phishing og malware Godkender bekræftelseskode... Fysisk tastaturlayout Lydstyrke diff --git a/chrome/app/resources/generated_resources_de.xtb b/chrome/app/resources/generated_resources_de.xtb index b4260195d38b0f..9b1b1c59dbfde9 100644 --- a/chrome/app/resources/generated_resources_de.xtb +++ b/chrome/app/resources/generated_resources_de.xtb @@ -1720,7 +1720,6 @@ und „Strg + Alt + dunkler“, um herauszuzoomen. Nicht nach Fehlerbehebung Einstellungen für Zugänglichkeit ändern -Einstellungen überprüfen Vertieft Ok Terminal zur Wiederherstellung öffnen @@ -1849,7 +1848,6 @@ und „Strg + Alt + dunkler“, um herauszuzoomen. Profilbild festlegen Screenshot der Programme, die sich momentan auf dem Bildschirm befinden Stromquellen werden überprüft… -Überprüfung der Datenschutzeinstellungen In angepinntem Tab öffnen Diese Erweiterung ist veraltet und wurde aufgrund der Unternehmensrichtlinie deaktiviert. Die Erweiterung kann automatisch aktiviert werden, wenn eine neuere Version verfügbar ist. Website @@ -2395,7 +2393,6 @@ Servernachricht: Bitte Parallels Desktop starten, um Windows zu installieren. Ihre Daten auf verschiedenen Websites lesen Diese Datei enthält vertrauliche Inhalte -Hier können Sie an einem Ort mehr über die wichtigsten Datenschutzeinstellungen erfahren und sie überprüfen Alle Drittanbieter-Cookies blockieren Google Chrome und Chrome OS – zusätzliche Nutzungsbedingungen Konto aktualisieren @@ -3326,6 +3323,7 @@ Möchten Sie starten? Einstellungen wiederherstellen , Ihr Administrator fordert Sie zum Ändern Ihres Passworts auf. Prüfen Sie zuerst, ob Ihr USB- oder Bluetooth-Schalter mit Ihrem Chromebook verbunden ist. Sie können auch die Tastatur verwenden. +Besserer Schutz vor Phishing und Malware durch erweitertes Safe Browsing Bestätigungscode wird geprüft… Belegung der physischen Tastatur Lautstärke diff --git a/chrome/app/resources/generated_resources_el.xtb b/chrome/app/resources/generated_resources_el.xtb index 0fb9fac115852d..cfa09dc888e967 100644 --- a/chrome/app/resources/generated_resources_el.xtb +++ b/chrome/app/resources/generated_resources_el.xtb @@ -1742,7 +1742,6 @@ Όχι αργότερα από Εντοπισμός σφαλμάτων Αλλαγή των ρυθμίσεων προσβασιμότητας -Έλεγχος ρυθμίσεων Συμπτυγμένο ΟK Άνοιγμα τερματικού ανάκτησης @@ -1871,7 +1870,6 @@ Ρύθμιση της εικόνας προφίλ σας Στιγμιότυπο οθόνης των προγραμμάτων που εμφανίζονται αυτήν τη στιγμή στην οθόνη Έλεγχος πηγών ενέργειας... -Έλεγχος απορρήτου Άνοιγμα σε καρφιτσωμένη καρτέλα Αυτή η επέκταση δεν είναι ενημερωμένη και έχει απενεργοποιηθεί από την εταιρική πολιτική. Ενδέχεται να ενεργοποιηθεί αυτόματα όταν υπάρχει διαθέσιμη μια νεότερη έκδοση. Ιστότοπος @@ -2419,7 +2417,6 @@ Εκκινήστε το Parallels Desktop για να εγκαταστήσετε τα Windows. Ανάγνωση των δεδομένων σας σε ορισμένους ιστότοπους Αυτό το αρχείο έχει ευαίσθητο περιεχόμενο. -Κατανοήστε και εξετάστε τις σημαντικότερες ρυθμίσεις απορρήτου σε ένα μέρος Αποκλεισμός όλων των cookie τρίτου μέρους Πρόσθετοι Όροι Google Chrome και Chrome OS Ενημέρωση λογαριασμού @@ -3351,6 +3348,7 @@ Επαναφορά ρυθμίσεων , ο διαχειριστής σας απαιτεί να αλλάξετε τον κωδικό πρόσβασης. Για να ξεκινήσετε, βεβαιωθείτε ότι ο διακόπτης USB ή Bluetooth είναι συνδεδεμένος στο Chromebook. Μπορείτε επίσης να χρησιμοποιήσετε τα πλήκτρα του πληκτρολογίου. +Η βελτιωμένη προστασία κάνει περισσότερα για τον αποκλεισμό ηλεκτρονικού ψαρέματος (phishing) και κακόβουλων προγραμμάτων Επαλήθευση κωδικού επιβεβαίωσης… Διάταξη φυσικού πληκτρολογίου Ένταση diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb index ee44dd7763fa9d..e983e18ad26b9b 100644 --- a/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb @@ -1742,7 +1742,6 @@ and Ctrl+Alt+Brightness down to zoom out. Not After Debug Change your accessibility settings -Review my settings Depressed OK Open recovery terminal @@ -1871,7 +1870,6 @@ and Ctrl+Alt+Brightness down to zoom out. Set your profile picture Screenshot of programs that are currently on the screen Checking power sources… -Privacy review Open as pinned tab This extension is outdated and disabled by enterprise policy. It might become enabled automatically when a newer version is available. Site @@ -2419,7 +2417,6 @@ and Ctrl+Alt+Brightness down to zoom out. Please launch Parallels Desktop to install Windows. Read your data on a number of websites This file has sensitive content -Understand and review the most critical privacy settings in one place Block all third-party cookies Google Chrome and Chrome OS additional terms Update account @@ -3351,6 +3348,7 @@ and Ctrl+Alt+Brightness down to zoom out. Restore Settings , your administrator requires you to change your password. To get started, please make sure that your USB or Bluetooth switch is connected to your Chromebook. You can also use keyboard keys. +Enhanced protection does more to block phishing and malware Verifying confirmation code… Physical keyboard layout volume diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb index 14ba0cf3586e29..00b950fb0e7e82 100644 --- a/chrome/app/resources/generated_resources_es-419.xtb +++ b/chrome/app/resources/generated_resources_es-419.xtb @@ -1720,7 +1720,6 @@ y Ctrl + Alt + Disminuir brillo para alejar. No después Depurar Cambiar la configuración de accesibilidad -Revisar mi configuración Disminuida Aceptar Abrir terminal de recuperación @@ -1849,7 +1848,6 @@ y Ctrl + Alt + Disminuir brillo para alejar. Establecer tu foto de perfil Captura de pantalla de los programas que aparecen Buscando fuentes de energía… -Revisión de la privacidad Abrir como pestaña fija Esta extensión está desactualizada e inhabilitada por política de la empresa. Podría habilitarse automáticamente cuando haya una versión nueva disponible. Sitio @@ -2395,7 +2393,6 @@ y Ctrl + Alt + Disminuir brillo para alejar. Inicia Parallels Desktop para instalar Windows. Leer los datos en un número de sitios web Este archivo incluye contenido sensible -Encuentra información sobre los parámetros de configuración de privacidad más importantes y revísalos en un solo lugar. Bloquear todas las cookies de terceros Condiciones Adicionales del Sistema operativo Chrome y Google Chrome Actualizar cuenta @@ -3326,6 +3323,7 @@ y Ctrl + Alt + Disminuir brillo para alejar. Restaurar configuración , tu administrador te solicita que cambies la contraseña. Para comenzar, asegúrate de que tu interruptor USB o Bluetooth esté conectado a tu Chromebook. También puedes usar las teclas del teclado. +La protección mejorada permite bloquear mejor la suplantación de identidad (phishing) y el software malicioso. Verificando el código de confirmación… Diseño del teclado físico Volumen diff --git a/chrome/app/resources/generated_resources_es.xtb b/chrome/app/resources/generated_resources_es.xtb index fce7e9ac2d3c73..7fc8847ad04cc7 100644 --- a/chrome/app/resources/generated_resources_es.xtb +++ b/chrome/app/resources/generated_resources_es.xtb @@ -1723,7 +1723,6 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami Anterior a Depurar Cambiar tu configuración de accesibilidad -Revisar mis ajustes Hundida Aceptar Abrir terminal en modo de recuperación @@ -1852,7 +1851,6 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami Selecciona tu foto de perfil Captura de pantalla de los programas que hay en la pantalla ahora mismo Comprobando fuentes de alimentación... -Revisión de privacidad Abrir como pestaña fija Esta extensión está obsoleta e inhabilitada por la política de empresas. Es posible que se habilite automáticamente cuando haya una nueva versión disponible. Sitio @@ -2398,7 +2396,6 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami Abre Parallels Desktop para instalar Windows. Leer tus datos en varios sitios web Este archivo incluye contenido sensible -Consulta y revisa los ajustes de privacidad más importantes en un solo lugar Bloquear todas las cookies de terceros Términos Adicionales de Google Chrome y Chrome OS Actualizar cuenta @@ -3328,6 +3325,7 @@ Puedes gestionar la configuración de esta cuenta instalando la aplicación Fami Restaurar configuración , tu administrador solicita que cambies la contraseña. Para empezar, comprueba que tu interruptor USB o Bluetooth esté conectado a tu Chromebook. También puedes usar teclas del teclado. +La protección mejorada es más eficaz para bloquear ataques de suplantación de identidad y software malicioso. Verificando el código de confirmación... Diseño de teclado físico Volumen diff --git a/chrome/app/resources/generated_resources_et.xtb b/chrome/app/resources/generated_resources_et.xtb index 8bf497be3f7781..c8b9ae3f691ead 100644 --- a/chrome/app/resources/generated_resources_et.xtb +++ b/chrome/app/resources/generated_resources_et.xtb @@ -1729,7 +1729,6 @@ väljasuumimiseks klahvikombinatsiooni Ctrl + Alt + Ereduse vähendamine.Mitte pärast Silu Juurdepääsetavuse seadete muutmine -Kuva minu seaded Lohkus Ok Ava taasteterminal @@ -1858,7 +1857,6 @@ väljasuumimiseks klahvikombinatsiooni Ctrl + Alt + Ereduse vähendamine.Profiilipildi määramine Ekraanipilt programmidest, mis on praegu ekraanil kuvatud Toiteallikate kontrollimine … -Privaatsusseadete ülevaatamine Ava kinnitatud vahelehel See laiendus on aegunud ja ettevõtte reeglitega keelatud. Kui uuem versioon muutub kättesaadavaks, siis võidakse see automaatselt lubada. Sait @@ -2404,7 +2402,6 @@ väljasuumimiseks klahvikombinatsiooni Ctrl + Alt + Ereduse vähendamine.Käivitage Windowsi installimiseks Parallels Desktop. Lugege oma andmeid mitmel veebisaidil See fail sisaldab tundlikku sisu -Vaadake ühes kohas üle kõige kriitilisemad privaatsusseaded ja tehke need endale selgeks Kõikide kolmanda osapoole küpsiste blokeerimine Google Chrome'i ja Chrome OS-i lisatingimused Värskenda kontot @@ -3335,6 +3332,7 @@ kasutades juhtpaneeli funktsiooni . Taasta seaded , administraator nõuab, et muudaksite parooli. Alustamiseks veenduge, et USB- või Bluetooth-lüliti oleks teie Chromebookiga ühendatud. Saate kasutada ka klaviatuuri klahve. +Täiustatud kaitse aitab andmepüüki ja pahavara paremini blokeerida Kinnituskoodi kinnitamine … Füüsilise klaviatuuri paigutus Helitugevus diff --git a/chrome/app/resources/generated_resources_eu.xtb b/chrome/app/resources/generated_resources_eu.xtb index 547611ad4cfef1..621d07a1556b33 100644 --- a/chrome/app/resources/generated_resources_eu.xtb +++ b/chrome/app/resources/generated_resources_eu.xtb @@ -1722,7 +1722,6 @@ Voice Match-ekin, Google-ren Laguntzailea eginbideak Ez honen atzetik Araztu Aldatu erabilerraztasun-ezarpenak -Berrikusi ezarpenak Beheratua Ados Ireki berreskuratzeko terminala @@ -1851,7 +1850,6 @@ Voice Match-ekin, Google-ren Laguntzailea eginbideak Ezarri profileko argazkia Pantailan dauden programen pantaila-argazkia Energia-iturriak egiaztatzen… -Pribatutasun-berrikuspena Ireki fitxa ainguratu gisa Enpresaren gidalerroak zaharkituta eta desgaituta utzi du luzapena. Automatikoki gai liteke bertsio berria eskuragarri egotean. Webgunea @@ -2397,7 +2395,6 @@ Txartel adimenduna sartuta edukitzea eskatzen du domeinuak. Windows instalatzeko, abiarazi Parallels Desktop. Irakurri zenbait webgunetan dituzun datuak Fitxategiak kontuzko edukia dauka -Ulertu eta berrikusi pribatutasun-ezarpen garrantzitsuenak toki berean Blokeatu hirugarrenen cookie guztiak Google Chrome eta Chrome OS zerbitzuen baldintza gehigarriak Eguneratu kontua @@ -3328,6 +3325,7 @@ Txartel adimenduna sartuta edukitzea eskatzen du domeinuak. Berrezarri ezarpenak , pasahitza aldatzeko eskatu dizu administratzaileak. Erabiltzen hasteko, ziurtatu USB edo Bluetooth bidezko etengailua Chromebook-era konektatuta dagoela. Teklatuaren teklak ere erabil ditzakezu. +Babes handiagoa eskaintzen du phishingaren eta malwarearen aurka Berrespen-kodea egiaztatzen… Teklatu fisikoaren diseinua Bolumena diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb index d9b34962ab8a30..bc923cddd5b7bb 100644 --- a/chrome/app/resources/generated_resources_fa.xtb +++ b/chrome/app/resources/generated_resources_fa.xtb @@ -1739,7 +1739,6 @@ نه بعد از رفع اشکال تغییر تنظیمات دسترس‌پذیریتان -مرور تنظیمات فرورفته تأیید باز کردن پایانه بازیابی @@ -1868,7 +1867,6 @@ عکس نمایه اضافه کنید نماگرفت برنامه‌هایی که درحال‌حاضر روی صفحه هستند درحال بررسی منابع برق... -مرور حریم‌خصوصی بازکردن به‌عنوان برگه پین شده این افزونه قدیمی است و خط‌مشی شرکت آن را غیرفعال کرده است. شاید وقتی یک نسخه جدیدتر در دسترس قرار گیرد به صورت خودکار فعال شود. سایت @@ -2416,7 +2414,6 @@ ‏لطفاً برای نصب Windows، ‏Parallels Desktop را راه‌اندازی کنید. خواندن داده‌های شما در تعدادی از وب‌سایت‌ها این فایل محتوای حساس دارد -در یک جا از تنظیمات حریم‌خصوصی بسیار مهم مطلع شوید و آن‌ها را مرور کنید مسدود کردن همه کوکی‌های شخص ثالث ‏شرایط تکمیلی Google Chrome و Chrome OS به‌روزرسانی حساب @@ -3348,6 +3345,7 @@ بازیابی تنظیمات سرپرستتان ()، از شما می‌خواهد که گذرواژه‌تان را عوض کنید. ‏برای شروع کار، لطفاً مطمئن شوید که کلید بلوتوث یا USB به Chromebook متصل باشد. می‌توانید از کلیدهای صفحه‌کلید هم استفاده کنید. +«محافظت بهبودیافته» کارهای بیشتری برای مسدود کردن رمزگیری و بدافزار انجام می‌دهد درحال راستی‌آزمایی کد تأیید… طرح‌بندی صفحه‌کلید فیزیکی میزان صدا diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb index 452488571016e0..23c36f39a06ddf 100644 --- a/chrome/app/resources/generated_resources_fi.xtb +++ b/chrome/app/resources/generated_resources_fi.xtb @@ -1737,7 +1737,6 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. Ei tämän jälkeen Vianetsintä Muokata esteettömyysasetuksia -Tarkista asetukset Laskettu OK Avaa palautusterminaali @@ -1866,7 +1865,6 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. Määritä profiilikuvasi Kuvakaappaus ohjelmista, jotka ovat näytöllä tällä hetkellä Tarkistetaan virtalähteitä… -Yksityisyystarkistus Avaa kiinnitetyllä välilehdellä Tämä laajennus on vanhentunut ja poistettu käytöstä yrityksen käytännön mukaisesti. Se voidaan ottaa käyttöön uudelleen automaattisesti, kun uusi versio on saatavilla. Sivusto @@ -2412,7 +2410,6 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. Käynnistä Parallels Desktop Windowsin asentamista varten. Lukea tietojasi useissa sivustoissa Tämä tiedosto sisältää arkaluontoista sisältöä -Tutustu tärkeimpiin yksityisyysasetuksiin yhdestä paikasta Estä kaikki kolmannen osapuolen evästeet Google Chromen ja Chrome-käyttöjärjestelmän lisäehdot Päivitä tili @@ -3340,6 +3337,7 @@ ja loitonna painamalla Ctrl + Alt + kirkkauden vähennys. Palauta asetukset , järjestelmänvalvojasi vaatii sinua vaihtamaan salasanasi. Varmista aluksi, että USB- tai Bluetooth-kytkin on yhdistetty Chromebookiisi. Voit käyttää myös näppäimistöä. +Parannettu suojaus torjuu tietojenkalastelua ja haittaohjelmia entistä tehokkaammin Vahvistuskoodia vahvistetaan… Fyysisen näppäimistön asettelu Äänenvoimakkuus diff --git a/chrome/app/resources/generated_resources_fil.xtb b/chrome/app/resources/generated_resources_fil.xtb index 2871d94fb6d9df..7ee72d6fac88d7 100644 --- a/chrome/app/resources/generated_resources_fil.xtb +++ b/chrome/app/resources/generated_resources_fil.xtb @@ -1739,7 +1739,6 @@ at Ctrl+Alt+Bawasan ang liwanag para mag-zoom out. Hindi Pagkatapos I-debug Baguhin ang iyong mga setting ng accessibility -Suriin ang aking mga setting Depressed Ok Buksan ang terminal sa pag-recover @@ -1868,7 +1867,6 @@ at Ctrl+Alt+Bawasan ang liwanag para mag-zoom out. Itakda ang iyong larawan sa profile Screenshot ng mga programang kasalukuyang nasa screen Sinusuri ang mga power source... -Pagsusuri sa privacy Buksan bilang Naka-pin na Tab Ang extension na ito ay luma na at na-disable ayon sa patakaran ng enterprise. Maaaring awtomatiko itong ma-enable kapag may available na bagong bersyon. Site @@ -2414,7 +2412,6 @@ Inaatasan ka ng na panatilihing nakalagay ang iyong smart c Pakilunsad ang Parallels Desktop para ma-install ang Windows. Basahin ang iyong data sa ilang website May sensitibong content ang file na ito -Maunawaan at suriin ang pinakamahahalagang setting ng privacy sa iisang lugar I-block ang lahat ng cookies ng third-party Mga Karagdagang Tuntunin ng Google Chrome at Chrome OS I-update ang account @@ -3345,6 +3342,7 @@ Inaatasan ka ng na panatilihing nakalagay ang iyong smart c I-restore ang Mga Setting , hinihiling sa iyo ng administrator mo na palitan ang iyong password. Para magsimula, pakitiyak na nakakonekta ang switch ng iyong USB o Bluetooth sa Chromebook mo. Puwede mo ring gamitin ang mga key sa keyboard. +Mas maraming magagawa ang pinahusay na proteksyon para mag-block ng phishing and malware Vine-verify ang code sa pagkumpirma... Layout ng pisikal na keyboard Volume diff --git a/chrome/app/resources/generated_resources_fr-CA.xtb b/chrome/app/resources/generated_resources_fr-CA.xtb index 233d2c39def7f2..69ddd658b8f415 100644 --- a/chrome/app/resources/generated_resources_fr-CA.xtb +++ b/chrome/app/resources/generated_resources_fr-CA.xtb @@ -1724,7 +1724,6 @@ et sur Ctrl+Alt+diminuer la luminosité pour effectuer un zoom arrière.Pas après le Débogage Modifier vos paramètres d'accessibilité -Vérifier mes paramètres Surbaissé OK Ouvrir le terminal de récupération @@ -1853,7 +1852,6 @@ et sur Ctrl+Alt+diminuer la luminosité pour effectuer un zoom arrière.Définir votre photo de profil Capture d'écran des programmes qui sont présentement à l'écran Vérification des sources d'alimentation en cours… -Vérification de la confidentialité Ouvrir dans un onglet épinglé Cette extension est obsolète et désactivée par la politique de l'entreprise. Il est possible qu’elle s’active automatiquement lorsqu’une nouvelle version sera disponible. Site @@ -2398,7 +2396,6 @@ et sur Ctrl+Alt+diminuer la luminosité pour effectuer un zoom arrière.Veuillez lancer Parallels Desktop pour installer Windows. Lire vos données sur un nombre défini de sites Web Le contenu de ce fichier est délicat -Vérifiez les paramètres de confidentialité les plus importants au même endroit Bloquez tous les témoins tiers Conditions supplémentaires pour Google Chrome et Chrome OS Mettre à jour le compte @@ -3328,6 +3325,7 @@ Souhaitez-vous lancer ? Restaurer les paramètres , votre administrateur vous demande de changer votre mot de passe. Pour commencer, veuillez vous assurer que votre commutateur USB ou Bluetooth est connecté à votre Chromebook. Vous pouvez aussi utiliser les touches du clavier. +La protection renforcée en fait plus pour bloquer l'hameçonnage et les logiciels nuisibles Vérification du code de confirmation en cours… Disposition du clavier physique Volume diff --git a/chrome/app/resources/generated_resources_fr.xtb b/chrome/app/resources/generated_resources_fr.xtb index 04b1fbcbec8640..0307f67ced8f5e 100644 --- a/chrome/app/resources/generated_resources_fr.xtb +++ b/chrome/app/resources/generated_resources_fr.xtb @@ -1724,7 +1724,6 @@ et Ctrl+Alt+Diminuer la luminosité pour faire un zoom arrière. Pas après le Déboguer Modifier vos paramètres d'accessibilité -Vérifier mes paramètres Bord en retrait OK Ouvrir le terminal de récupération @@ -1853,7 +1852,6 @@ et Ctrl+Alt+Diminuer la luminosité pour faire un zoom arrière. Définir votre photo de profil Captures d'écran des programmes actuellement à l'écran Vérification des sources d'alimentation… -Contrôle de la confidentialité Ouvrir dans un onglet épinglé Cette extension est obsolète et désactivée par une stratégie d'entreprise. Il se peut qu'elle soit activée automatiquement lors de la publication d'une version plus récente. Site @@ -2399,7 +2397,6 @@ et Ctrl+Alt+Diminuer la luminosité pour faire un zoom arrière. Veuillez lancer Parallels Desktop pour installer Windows. Lire vos données sur plusieurs sites web Le contenu de ce fichier est sensible -Retrouvez vos paramètres de confidentialité les plus importants au même endroit Bloquer tous les cookies tiers Conditions d'utilisation supplémentaires de Google Chrome et Chrome OS Mettre à jour le compte @@ -3330,6 +3327,7 @@ Souhaitez-vous lancer  ? Rétablir les paramètres , votre administrateur exige que vous changiez votre mot de passe. Pour commencer, assurez-vous que votre contacteur USB ou Bluetooth est connecté à votre Chromebook. Vous pouvez également utiliser les touches du clavier. +La protection renforcée assure une meilleure protection contre l'hameçonnage et les logiciels malveillants Vérification du code de confirmation… Disposition du clavier physique Volume diff --git a/chrome/app/resources/generated_resources_gl.xtb b/chrome/app/resources/generated_resources_gl.xtb index 3df8838e3c531c..acc27e94f67102 100644 --- a/chrome/app/resources/generated_resources_gl.xtb +++ b/chrome/app/resources/generated_resources_gl.xtb @@ -1721,7 +1721,6 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M Non despois de Depuración Cambiar a configuración de accesibilidade -Revisar configuración Afundida Aceptar Abrir terminal de recuperación @@ -1850,7 +1849,6 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M Definir a túa foto do perfil Captura de pantalla dos programas que se atopan actualmente na pantalla Comprobando fontes de alimentación… -Revisión de privacidade Abrir como pestana fixada Esta extensión é obsoleta e está desactivada pola política da empresa. Quizais se active automaticamente cando estea dispoñible unha nova versión. Sitio @@ -2396,7 +2394,6 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M Inicia Parallels Desktop para instalar Windows. Lectura dos teus datos nun determinado número de sitios web Este ficheiro inclúe contido confidencial -Comprende o funcionamento das opcións de configuración de privacidade máis importantes e revísaas nun só lugar Bloquea todas as cookies de terceiros Condicións adicionais de Google Chrome e Chrome OS Actualizar conta @@ -3327,6 +3324,7 @@ Se máis tarde decides que prefires que o teu fillo ou filla non utilice Voice M Restaurar configuración , o teu administrador require que cambies o contrasinal. Para comezar, comproba que o interruptor USB ou Bluetooth estea conectado ao Chromebook. Tamén podes utilizar o teclado. +A protección mellorada é máis eficaz á hora de bloquear o phishing e o software malicioso Verificando código de confirmación… Deseño do teclado físico Volume diff --git a/chrome/app/resources/generated_resources_gu.xtb b/chrome/app/resources/generated_resources_gu.xtb index 16cff3b97c7543..4ebdde39b3d7ed 100644 --- a/chrome/app/resources/generated_resources_gu.xtb +++ b/chrome/app/resources/generated_resources_gu.xtb @@ -1721,7 +1721,6 @@ આના પછી નહીં ડીબગ કરો તમારા ઍક્સેસિબિલિટી સેટિંગ બદલો -મારા સેટિંગનો રિવ્યૂ કરો દબાવેલા બરાબર, સમજાઇ ગયું પુનઃપ્રાપ્તિ માટેનું ટર્મિનલ ખોલો @@ -1850,7 +1849,6 @@ તમારું પ્રોફાઇલ ચિત્ર સેટ કરો હાલમાં સ્ક્રીન પર છે તે પ્રોગ્રામનો સ્ક્રીનશૉટ પાવરના સ્રોતો શોધી રહ્યાં છીએ... -પ્રાઇવસીનો રિવ્યૂ પિન કરેલા ટૅબ તરીકે ખોલો આ એક્સ્ટેંશન જૂનું થઈ ગયું છે અને એન્ટરપ્રાઇસ પોલિસી દ્વારા બંધ થયું છે. જ્યારે એક નવું વર્ઝન ઉપલબ્ધ થાય ત્યારે તે ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે. સાઇટ @@ -2396,7 +2394,6 @@ Windows ઇન્સ્ટૉલ કરવા માટે કૃપા કરીને Parallels ડેસ્કટૉપ લૉન્ચ કરો. ઘણી વેબસાઇટ્સ પર તમારો ડેટા વાંચી શકે છે આ ફાઇલમાં સંવેદનશીલ કન્ટેન્ટ છે. -એક જ જગ્યાએથી સૌથી મહત્ત્વપૂર્ણ પ્રાઇવસી સેટિંગને સમજો અને રિવ્યૂ કરો તમામ તૃતીય-પક્ષની કૂકીઝને અવરોધિત કરો Google Chrome અને Chrome OS વધારાની શરતો એકાઉન્ટ અપડેટ કરો @@ -3327,6 +3324,7 @@ સેટિંગ રિસ્ટોર કરો , તમારા વ્યવસ્થાપક માટે આવશ્યક છે કે તમે તમારો પાસવર્ડ બદલો. શરૂ કરવા માટે, કૃપા કરીને ખાતરી કરો કે તમારા USB અથવા બ્લૂટૂથની સ્વિચ તમારી Chromebook સાથે કનેક્ટ કરેલી છે. તમે કીબોર્ડની કીનો પણ ઉપયોગ કરી શકો છો. +વધારેલી સુરક્ષા ફિશિંગ અને માલવેરને બ્લૉક કરવામાં વધુ સહાયરૂપ થાય છે કન્ફર્મેશન કોડ ચકાસી રહ્યાં છીએ... વાસ્તવિક કીબોર્ડનું લેઆઉટ વૉલ્યૂમ diff --git a/chrome/app/resources/generated_resources_hi.xtb b/chrome/app/resources/generated_resources_hi.xtb index 3bd70ec65c84ca..fa0a45fe2e056a 100644 --- a/chrome/app/resources/generated_resources_hi.xtb +++ b/chrome/app/resources/generated_resources_hi.xtb @@ -1738,7 +1738,6 @@ बाद में नहीं डीबग अपनी सुलभता सेटिंग बदलें -'मेरी सेटिंग' की समीक्षा करें छोटे आकार में ठीक है वापस पाने वाला टर्मिनल खोलें @@ -1867,7 +1866,6 @@ अपना प्रोफ़ाइल चित्र सेट करें इस समय, स्क्रीन पर मौजूद प्रोग्राम का स्क्रीनशॉट पावर के स्रोतों की जांच की जा रही है... -निजता की समीक्षा छोटे टैब के रूप में खोलें यह एक्‍सटेंशन पुराना हो चुका है और एंटरप्राइज़ नीति द्वारा अक्षम कर दिया गया है. ज़्यादा नया वर्शन उपलब्‍ध हो जाने पर वह अपने आप सक्षम हो सकता है. साइट @@ -2413,7 +2411,6 @@ Windows को इंस्टॉल करने के लिए कृपया Parallels Desktop को लॉन्च करें. अपना डेटा कई वेबसाइटों पर पढ़ें इस फ़ाइल में संवेदनशील सामग्री है -एक ही जगह पर सबसे ज़रूरी 'निजता सेटिंग' को समझें और उनकी समीक्षा करें सभी तृतीय पक्ष कुकी अवरोधित करें Google Chrome और Chrome OS की दूसरी शर्तें खाता अपडेट करें @@ -3343,6 +3340,7 @@ सेटिंग फिर से स्थापित करें , आपके व्यवस्थापक के लिए ज़रूरी है कि आप अपना पासवर्ड बदलें. शुरू करने के लिए, कृपया पक्का करें कि आपके यूएसबी या ब्लूटूथ स्विच को Chromebook से कनेक्ट किया गया हो. कनेक्शन की जांच के लिए, आप कीबोर्ड के बटन भी इस्तेमाल कर सकते हैं. +बेहतर सुरक्षा की मदद से फ़िशिंग और मैलवेयर को बेहतर तरीके से ब्लॉक किया जाता है पुष्टिकरण कोड की पुष्टि की जा रही है... फ़िज़िकल कीबोर्ड लेआउट मात्रा diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb index 0193c86435d6b2..4d62c86564c916 100644 --- a/chrome/app/resources/generated_resources_hr.xtb +++ b/chrome/app/resources/generated_resources_hr.xtb @@ -1730,7 +1730,6 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz. Ne nakon Otkloni pogrešku promijeniti postavke pristupačnosti -Pregled postavki Utisnuto U redu Otvorite terminal za oporavak @@ -1859,7 +1858,6 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz. Postavite profilnu sliku Snimka zaslona programa koji su trenutačno na zaslonu Provjera izvora napajanja... -Pregled privatnosti Otvori kao prikvačenu karticu Proširenje je zastarjelo, pa su ga pravila tvrtke onemogućila. Možda će se automatski omogućiti kada postane dostupna novija verzija. Web lokacija @@ -2407,7 +2405,6 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz. Pokrenite Parallels Desktop da biste instalirali Windows. čitati vaše podatke s raznih web-lokacija Ova datoteka ima osjetljiv sadržaj -Objašnjenje i pregled najkritičnijih postavki privatnosti na jednom mjestu Blokiraj sve kolačiće trećih strana Dodatni uvjeti za Google Chrome i OS Chrome Ažuriraj račun @@ -3339,6 +3336,7 @@ i Ctrl + Alt + Smanjivanje svjetline da biste smanjili prikaz. Vrati postavke , vaš administrator traži da promijenite zaporku. Da biste započeli, provjerite je li USB ili Bluetooth prekidač povezan s Chromebookom. Možete upotrijebiti i tipke tipkovnice. +Poboljšana zaštita blokira krađu identiteta i zlonamjerni softver na više načina Potvrđivanje potvrdnog koda... Raspored fizičke tipkovnice Glasnoća diff --git a/chrome/app/resources/generated_resources_hu.xtb b/chrome/app/resources/generated_resources_hu.xtb index a377f6d095bfb8..2d733f88682797 100644 --- a/chrome/app/resources/generated_resources_hu.xtb +++ b/chrome/app/resources/generated_resources_hu.xtb @@ -1736,7 +1736,6 @@ Ha kezelni szeretné a fiók beállításait, telepítse eszközére a Family Li Ezután nem: Hibakeresés Kisegítő beállítások módosítása -Beállítások áttekintése Süllyesztett OK Visszaállítási terminál megnyitása @@ -1865,7 +1864,6 @@ Ha kezelni szeretné a fiók beállításait, telepítse eszközére a Family Li Profilkép beállítása A jelenleg a képernyőn lévő programok képernyőképe Erőforrások ellenőrzése… -Adatvédelmi beállítások áttekintése Megnyitás rögzített lapként Ez a bővítmény elavult, így a vállalati házirend letiltotta. A bővítményt automatikusan ismét engedélyezheti a rendszer akkor, amikor egy újabb verzió elérhetővé válik. Webhely @@ -2411,7 +2409,6 @@ A(z) megköveteli, hogy ne távolítsa el az intelligens k A Windows telepítéséhez indítsa el a Parallels Desktop alkalmazást. Adatok beolvasása számos webhelyen Ebben a fájlban bizalmas tartalom található. -Egyetlen helyen ismerheti meg és tekintheti át a legfontosabb adatvédelmi beállításokat. Az összes harmadik féltől származó cookie tiltása A Google Chrome és a Chrome OS Kiegészítő Általános Szerződési Feltételei Fiók frissítése @@ -3341,6 +3338,7 @@ Elindítja a következőt: ?A beállítások visszaállítása , az Ön rendszergazdája jelszómódosításra kéri. A kezdéshez győződjön meg arról, hogy az USB- vagy Bluetooth-kapcsolattal rendelkező kapcsoló csatlakoztatva van a Chromebookhoz. Használhat billentyűzetet is. +A Speciális védelem még többet tesz annak érdekében, hogy letiltsa az adathalászatot és a rosszindulatú programokat Megerősítő kód ellenőrzése… Fizikai billentyűzetkiosztás Hangerő diff --git a/chrome/app/resources/generated_resources_hy.xtb b/chrome/app/resources/generated_resources_hy.xtb index 4b3c8ddc46cb43..b5c6fca58784cc 100644 --- a/chrome/app/resources/generated_resources_hy.xtb +++ b/chrome/app/resources/generated_resources_hy.xtb @@ -1728,7 +1728,6 @@ Ոչ ուշ Վրիպազերծել Փոխել ձեր մատչելիության կարգավորումները -Ստուգել իմ կարգավորումները Սեղմված Եղավ Բացել վերականգնման տերմինալը @@ -1857,7 +1856,6 @@ Ընտրեք պրոֆիլի լուսանկար Ծրագրերի սքրինշոթ, որոնք այժմ էկրանին են։ Սնուցման աղբյուրների ստուգում… -Գաղտնիության պարամետրերի ստուգում Բացել որպես ամրացված ներդիր Այս ընդլայնումը հնացած է, ուստի կասեցվել է ձեռնարկության քաղաքականության կողմից: Երբ նոր տարբերակը մատչելի լինի, այն կարող է ավտոմատ միացվել: Կայք @@ -2405,7 +2403,6 @@ Windows-ը տեղադրելու համար գործարկեք Parallels Desktop-ը։ Կարդալ ձեր տվյալները մի շարք կայքերում Այս ֆայլը պարունակում է խիստ անձնական բովանդակություն -Ստուգեք գաղտնիության ամենակարևոր կարգավորումները՝ մեկ տեղում Բոլոր կողմնակի քուքիների արգելափակում Google Chrome-ի և Chrome OS-ի լրացուցիչ պայմաններ Թարմացնել հաշիվը @@ -3337,6 +3334,7 @@ Վերականգնել կարգավորումները , ձեր ադմինիստրատորը պահանջում է, որ փոխեք ձեր գաղտնաբառը: Սկսելու համար համոզվեք, որ USB կամ Bluetooth փոխանջատիչը միացված է ձեր Chromebook սարքին։ Դուք կարող եք նաև օգտագործել ստեղնաշարի ստեղները։ +Լրացուցիչ պաշտպանությունն օգնում է խուսափել ֆիշինգից և արգելափակել վնասաբեր ծրագրերը Հաստատման կոդը ստուգվում է… Ֆիզիկական ստեղնաշարի դասավորություն Ձայնի ուժգնություն diff --git a/chrome/app/resources/generated_resources_id.xtb b/chrome/app/resources/generated_resources_id.xtb index 7ac09ac3210d7e..ffbd33aa3701d9 100644 --- a/chrome/app/resources/generated_resources_id.xtb +++ b/chrome/app/resources/generated_resources_id.xtb @@ -1738,7 +1738,6 @@ dan Ctrl+Alt+Kurangi kecerahan untuk memperkecil. Tidak Setelah Debug Mengubah setelan aksesibilitas Anda -Tinjau setelan saya Diturunkan Oke Buka terminal pemulihan @@ -1867,7 +1866,6 @@ dan Ctrl+Alt+Kurangi kecerahan untuk memperkecil. Setel gambar profil Screenshot program yang sedang ditampilkan di layar Memeriksa sumber listrik... -Tinjauan privasi Buka sebagai Tab Terpasang Ekstensi ini sudah usang dan telah dinonaktifkan berdasarkan kebijakan perusahaan. Ekstensi mungkin akan diaktifkan secara otomatis saat versi yang lebih baru sudah tersedia. Situs @@ -2413,7 +2411,6 @@ dan Ctrl+Alt+Kurangi kecerahan untuk memperkecil. Luncurkan Parallels Desktop untuk menginstal Windows. Membaca data Anda di sejumlah situs File ini berisi konten sensitif -Pahami dan tinjau setelan privasi paling penting di satu tempat Cekal semua cookie pihak ketiga Persyaratan Tambahan Google Chrome dan Chrome OS Perbarui akun @@ -3344,6 +3341,7 @@ dan Ctrl+Alt+Kurangi kecerahan untuk memperkecil. Pulihkan Setelan , administrator mewajibkan Anda untuk mengganti sandi. Untuk memulai, pastikan USB atau tombol Bluetooth terhubung ke Chromebook. Anda juga dapat menggunakan tombol keyboard. +Perlindungan yang ditingkatkan akan memblokir phishing dan malware dengan lebih optimal Memverifikasi kode konfirmasi ... Tata letak keyboard fisik Volume diff --git a/chrome/app/resources/generated_resources_is.xtb b/chrome/app/resources/generated_resources_is.xtb index 47e5a588eab863..d73946bb675a9b 100644 --- a/chrome/app/resources/generated_resources_is.xtb +++ b/chrome/app/resources/generated_resources_is.xtb @@ -1738,7 +1738,6 @@ Annars skaltu skrá þig út núna svo breytingarnar á þessum reikningi taki g Ekki eftir Villuleit Breyta aðgengisstillingum -Yfirfara stillingar Þrykkt Í lagi Opna endurheimtarstöð @@ -1867,7 +1866,6 @@ Annars skaltu skrá þig út núna svo breytingarnar á þessum reikningi taki g Veldu prófílmynd Skjámynd af forritum sem eru á skjánum núna Athugar aflgjafa... -Persónuverndaryfirferð Opna sem fastan flipa Þessi viðbót er úrelt og regla frá fyrirtækinu hefur gert hana óvirka. Hún gæti sjálfkrafa orðið virk þegar ný útgáfa verður aðgengileg. Vefsvæði @@ -2413,7 +2411,6 @@ Annars skaltu skrá þig út núna svo breytingarnar á þessum reikningi taki g Ræstu Parallels Desktop til að setja upp Windows. Lesa gögnin þín á fjölda vefsvæða Skráin inniheldur viðkvæmt efni -Kynntu þér og farðu yfir mikilvægar persónuverndarstillingar á einum stað Útiloka öll fótspor þriðju aðila Viðbótarskilmálar Google Chrome og Chrome OS Uppfæra reikning @@ -3344,6 +3341,7 @@ Annars skaltu skrá þig út núna svo breytingarnar á þessum reikningi taki g Endurheimta stillingar , kerfisstjóri krefst þess að þú breytir aðgangsorðinu þínu. Til að hefjast handa skaltu vera viss um að USB- eða Bluetooth-rofinn sé tengdur við Chromebook. Þú getur einnig notað lykla á lyklaborðinu. +Aukin vernd gengur lengra í að loka á vefveiðar og spilliforrit Staðfestir staðfestingarkóða... Uppsetning vélbúnaðarlyklaborðs Hljóðstyrkur diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb index 9db2f6a0df5776..ef5e170aa942cc 100644 --- a/chrome/app/resources/generated_resources_it.xtb +++ b/chrome/app/resources/generated_resources_it.xtb @@ -1728,7 +1728,6 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom. Non dopo Debug Modifica delle impostazioni di accesibilità -Rivedi le impostazioni Incassato OK Apri terminale di ripristino @@ -1857,7 +1856,6 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom. Imposta l'immagine del profilo Screenshot dei programmi attualmente sullo schermo Controllo delle fonti di alimentazione… -Revisione della privacy Apri in una scheda bloccata Questa estensione è obsoleta e disattivata in base ai criteri aziendali. Potrebbe essere attivata automaticamente quando sarà disponibile una nuova versione. Sito @@ -2405,7 +2403,6 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom. Avvia Parallels Desktop per installare Windows. Lettura dei dati su una serie di siti web Questo file include contenuti sensibili -Scopri e rivedi le impostazioni di privacy più importanti in un unico posto Blocca tutti i cookie di terze parti Termini aggiuntivi di Google Chrome e Chrome OS Aggiorna account @@ -3337,6 +3334,7 @@ e Ctrl + Alt + Riduzione luminosità per diminuire lo zoom. Ripristina impostazioni , il tuo amministratore ti chiede di cambiare la password. Per iniziare, assicurati che il tuo sensore USB o Bluetooth sia collegato al dispositivo Chromebook. Puoi anche usare i tasti della tastiera. +La protezione avanzata blocca malware e tentativi di phishing con maggiore efficacia Verifica del codice di conferma in corso… Layout tastiera fisica Volume diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb index 2c972b6fbffec0..4bcb3614f9257e 100644 --- a/chrome/app/resources/generated_resources_iw.xtb +++ b/chrome/app/resources/generated_resources_iw.xtb @@ -1738,7 +1738,6 @@ לא אחרי ניפוי באגים שינוי הגדרות הנגישות שלך -בדיקת ההגדרות שלי שקוע אישור פתיחת טרמינל שחזור @@ -1867,7 +1866,6 @@ הגדרת תמונת הפרופיל צילום מסך של התוכנות שמוצגות כרגע במסך מקורות החשמל בבדיקה… -בדיקת הגדרות פרטיות פתיחה ככרטיסייה מוצמדת תוסף זה הוא מיושן והושבת בהתאם למדיניות הארגון. ייתכן שהוא יופעל באופן אוטומטי כשתצא גרסה חדשה יותר. אתר @@ -2413,7 +2411,6 @@ ‏יש להפעיל את Parallels Desktop כדי להתקין את Windows. קריאת הנתונים שלך במספר אתרים הקובץ הזה מכיל תוכן רגיש -הבנת ובדיקת הגדרות הפרטיות החשובות ביותר – במקום אחד. ‏חסום את כל קובצי ה-Cookie של צד שלישי ‏תנאים נוספים של Google Chrome ו-Chrome OS עדכון חשבון @@ -3344,6 +3341,7 @@ שחזור הגדרות , מנהל המערכת מבקש ממך לשנות את הסיסמה שלך. ‏כדי להתחיל, עליך לוודא שהמתג ב-USB או ב-Bluetooth מחובר ל-Chromebook. ניתן גם להשתמש במקשי המקלדת. +עם ההגנה המשופרת, החסימה של פישינג ותוכנות זדוניות מקיפה יותר בתהליך אימות של קוד האישור... פריסת מקלדת פיזית עוצמת קול diff --git a/chrome/app/resources/generated_resources_ja.xtb b/chrome/app/resources/generated_resources_ja.xtb index fa66741812ea29..3f86298c2ecfe1 100644 --- a/chrome/app/resources/generated_resources_ja.xtb +++ b/chrome/app/resources/generated_resources_ja.xtb @@ -1720,7 +1720,6 @@ 終了時刻 デバッグ ユーザー補助設定の変更 -設定を確認 沈み彫り OK リカバリ ターミナルを開く @@ -1849,7 +1848,6 @@ プロフィール画像の設定 現在画面に表示されているプログラムのスクリーンショット 電源を確認しています... -プライバシーの確認 固定されたタブとして開く この拡張機能は古く、企業のポリシーによって無効にされました。新しいバージョンが利用可能になったときに自動的に有効になる可能性があります。 サイト @@ -2395,7 +2393,6 @@ Windows をインストールするには Parallels Desktop を起動してください。 多数のウェブサイトでのユーザーデータの読み取り このファイルにはデリケートなコンテンツが含まれています -最も重要なプライバシー設定を 1 か所で確認して変更できます すべてのサードパーティの Cookie をブロック Google Chrome および Chrome OS 追加利用規約 アカウントを更新 @@ -3321,6 +3318,7 @@ 設定を元に戻す さん、管理者がパスワードの変更をリクエストしています。 始める前に、USB または Bluetooth スイッチが Chromebook に接続されていることをご確認ください。キーボードのキーを使うこともできます。 +保護強化機能により、フィッシングを防ぎ、不正なソフトウェアをより強力にブロックします 確認コードを確認しています... 物理キーボード配列 音量 @@ -6770,6 +6768,7 @@ 有効なメールアドレスを入力してください 特定の動画サイトで利用可能 USB キーボードが接続されました +サイド検索 有効期限(年) 粗く、途切れがち デバイスを検証(&I) diff --git a/chrome/app/resources/generated_resources_ka.xtb b/chrome/app/resources/generated_resources_ka.xtb index 88ee075b9e54e0..1d7683ebb528d2 100644 --- a/chrome/app/resources/generated_resources_ka.xtb +++ b/chrome/app/resources/generated_resources_ka.xtb @@ -1727,7 +1727,6 @@ არა შემდეგ გამართვა სპეციალური შესაძლებლობების პარამეტრების შეცვლა -ჩემი პარამეტრების შემოწმება ჩაწეული კარგი აღდგენის ტერმინალის გახსნა @@ -1856,7 +1855,6 @@ თქვენი პროფილის სურათის დაყენება ეკრანზე ამჟამად გაშვებული პროგრამების ანაბეჭდი მიმდინარეობს ელკვების წყაროების შემოწმება… -კონფიდენციალურობის შემოწმება ჩამაგრებული ჩანართის სახით გახსნა ეს არის გაფართოება მოძველებულია და გამორთულია საწარმოს პოლიტიკის შესაბამისად. ეს შეიძლება ჩაირთოს ავტომატურად, როდესაც ხელმისაწვდომი იქნება ახალი ვერსია. საიტი @@ -2404,7 +2402,6 @@ Windows-ის ინსტალაციისთვის გაუშვით Parallels Desktop. წაიკითხეთ თქვენი მონაცემები რამდენიმე ვებსაიტზე ეს ფაილი შეიცავს სენსიტიურ კონტენტს -ერთი სივრციდან შეამოწმეთ კონფიდენციალურობის ყველაზე მნიშვნელოვანი პარამეტრები დაბლოკეთ მესამე მხარის ყველა ქუქი-ჩანაწერი Google Chrome-ისა და Chrome OS-ის დამატებითი პირობები ანგარიშის განახლება @@ -3336,6 +3333,7 @@ პარამეტრების აღდგენა , ადმინისტრატორი თქვენი პაროლის შეცვლას მოითხოვს. დასაწყებად დარწმუნდით, რომ თქვენი USB ან Bluetooth გადამრთველი დაკავშირებულია თქვენს Chromebook-თან. გარდა ამისა, შეგიძლიათ კლავიატურის კლავიშების გამოყენება. +გაძლიერებული დაცვა გთავაზობთ ფიშინგისა და მავნე პროგრამებისგან დაცვის მეტ საშუალებას მიმდინარეობს დადასტურების კოდის შემოწმება… ფიზიკური კლავიატურის განლაგება ხმა diff --git a/chrome/app/resources/generated_resources_kk.xtb b/chrome/app/resources/generated_resources_kk.xtb index 8a3c7f9b8a656b..a8eea407658b7c 100644 --- a/chrome/app/resources/generated_resources_kk.xtb +++ b/chrome/app/resources/generated_resources_kk.xtb @@ -1722,7 +1722,6 @@ Кейін емес Түзету Арнайы мүмкіндіктер параметрлерін өзгерту -Параметрлерімді көру Басылыңқы Жарайды Қалпына келтіру терминалын ашу @@ -1851,7 +1850,6 @@ Профиль суретін реттеу Экрандағы ашық бағдарламалардың скриншоты Қуат көздері тексерілуде... -Құпиялылықты қарап шығу Бекітілген қойынды ретінде ашу Бұл кеңейтім ескіргендіктен, кәсіпорын саясатына сәйкес өшірілді. Жаңа нұсқасы қолжетімді болғанда, ол автоматты түрде қосылуы мүмкін. Сайт @@ -2398,7 +2396,6 @@ Windows жүйесін орнату үшін Parallels Desktop-ты іске қосыңыз. Көптеген веб-сайттардағы деректеріңізді оқу Бұл файлда құпия ақпарат бар. -Құпиялылықтың аса маңызды параметрлерін бір жерден түсініп, қарап алыңыз. Барлық үшінші тарап cookie файлын бөгеу Google Chrome және Chrome OS қосымша шарттары Аккаунтты жаңарту @@ -3329,6 +3326,7 @@ Параметрлерді қалпына келтіру , әкімшіңіз құпия сөздің өзгертілуін талап етеді. Бастау үшін USB немесе Bluetooth ауыстырғышының Chromebook-қа жалғанғанын тексеріңіз. Пернетақта пернелерін де пайдалануға болады. +Жақсартылған қорғаныс фишинг пен зиянды бағдарламаларды бөгеуде көбірек істейді. Растау коды тексерілуде... Физикалық пернетақта орналасуы Дыбыс деңгейі diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb index b534e523a68e94..851647cb6c11a1 100644 --- a/chrome/app/resources/generated_resources_km.xtb +++ b/chrome/app/resources/generated_resources_km.xtb @@ -1738,7 +1738,6 @@ មិនបន្ទាប់ពី កម្ចាត់កំហុស ប្តូរការកំណត់លទ្ធភាពប្រើប្រាស់របស់អ្នក -ពិនិត្យមើល​ការកំណត់​របស់ខ្ញុំ លឹបចូល យល់ព្រម បើក​ស្ថានីយ​ស្ដារ @@ -1867,7 +1866,6 @@ កំណត់​រូបភាព​កម្រងព័ត៌មាន​របស់អ្នក រូបថតអេក្រង់របស់កម្មវិធី ដែលបង្ហាញនៅលើអេក្រង់ក្នុងពេលនេះ កំពុង​ពិនិត្យមើល​ប្រភព​ថាមពល... -ការពិនិត្យមើល​ឯកជនភាព បើកជាផ្ទាំងដែលបានដៅ ផ្នែកបន្ថែមនេះហួសសម័យហើយ ហើយបានបិទដំណើរការដោយគោលការណ៍សហគ្រាស។ វាអាចបើកដំណើរការដោយស្វ័យប្រវត្តិ នៅពេលមានកំណែថ្មីជាងនេះ។ គេហទំព័រ @@ -2413,7 +2411,6 @@ សូមចាប់ផ្ដើម Parallels Desktop ដើម្បីដំឡើង Windows។ អានទិន្នន័យរបស់អ្នកនៅលើគេហទំព័រមួយចំនួន ឯកសារនេះមានខ្លឹមសាររសើប -ស្វែងយល់ និងពិនិត្យមើល​ការកំណត់​ឯកជនភាព​សំខាន់បំផុត​នៅកន្លែង​តែមួយ ទប់ស្កាត់ខូគីរបស់ភាគីទីបីទាំងអស់ លក្ខខណ្ឌបន្ថែម​របស់ Google Chrome និង Chrome OS ធ្វើបច្ចុប្បន្នភាព​គណនី @@ -2521,6 +2518,7 @@ កំណត់​ការដាក់កំហិត​គេហទំព័រ និង​រយៈពេលកំណត់​នៅលើអេក្រង់​ដោយប្រើ Family Link មិនអាចដំឡើង​គោលការណ៍នៅលើឧបករណ៍​បានទេ។ នៅសល់ប្រហែល ទៀត +ទទួលបាន​ការបញ្ជាក់អំពីការញ័រ​សម្រាប់សកម្មភាព​ផ្សេងៗដូចជា មុខងារបំបែក​អេក្រង់ និងការប្ដូរតុជាដើម។ &ពិនិត្យអក្ខរាវិរុទ្ធ ដំណើរការ​នេះ​អាច​ចំណាយ​ពេល​ពីរបីនាទី។ កំពុងរៀបចំទម្រង់ផ្ទុក​ Linux ។ មើលផ្ទាំង Chrome ថ្មីៗពីទូរសព្ទ​របស់អ្នក @@ -3344,6 +3342,7 @@ ស្តារការកំណត់ , អ្នកគ្រប់គ្រង​របស់អ្នក​តម្រូវឲ្យ​អ្នកប្តូរ​ពាក្យសម្ងាត់​របស់​អ្នក។ ដើម្បីចាប់ផ្ដើម សូមប្រាកដថាឧបករណ៍ចុចសម្រាប់ជនពិការដែលប្រើប៊្លូធូស ឬ USB ត្រូវបានភ្ជាប់ជាមួយ Chromebook របស់អ្នក។ អ្នកក៏អាច​ប្រើគ្រាប់ចុចរបស់ក្ដារចុចបានផងដែរ។ +ការការពារ​ដែលប្រសើរជាងមុនធ្វើសកម្មភាពសកម្មជាងមុន ដើម្បីទប់ស្កាត់ការដាក់នុយ និងកម្មវិធីគ្រោះថ្នាក់ កំពុងផ្ទៀងផ្ទាត់លេខ​កូដ​បញ្ជាក់... ប្លង់​ក្ដារចុច​រូបវន្ត សម្លេង @@ -4918,6 +4917,7 @@ ពិនិត្យមើល​ទូរសព្ទ​របស់អ្នក កំណត់ម៉ាស៊ីន​ស្វែងរកលំនាំដើម​របស់អ្នក​សម្រាប់​កម្មវិធីរុករកតាមអ៊ីនធឺណិត Chrome និង​កម្មវិធី​ចាប់ផ្ដើម ដើម្បី​ប្រើ Smart Lock សូមប្ដូរ​ទៅប្រើ​កម្រងព័ត៌មាន​អ្នក​ប្រើប្រាស់​ចម្បង​នៅលើទូរសព្ទរបស់អ្នក +កំណត់ហេតុ​ទាំងនេះត្រូវបាន​រក្សាទុកនៅក្នុង "ឯកសាររបស់ខ្ញុំ" ជា ប្តូរការកំណត់ភាសា និងធាតុបញ្ចូល ដាក់ឈ្មោះឧបករណ៍ថា ដៅទំព័រនេះដើម្បី ចាប់ផ្តើម អេក្រង់... @@ -5694,6 +5694,7 @@ សោសុវត្ថិភាព​ខាងក្រៅ ឬ​ឧបករណ៍​ចាប់សញ្ញា​ដែលភ្ជាប់​មកជាមួយ {NUM_EXTENSIONS,plural, =1{កម្មវិធីបន្ថែមមួយ​ត្រូវបានច្រានចោល}other{កម្មវិធីបន្ថែម # ត្រូវបានច្រានចោល}} ការដំឡើងកំណែ​បានបញ្ចប់ហើយ +កម្លាំងចុច ​បានបាត់ថាសក្រដាស ប្រតិបត្តិការសរសេរបានឈានដល់ប្រវែងអតិបរមានៃគុណលក្ខណៈចំពោះ៖ "" អ្នក​មាន​ម៉ាស៊ីន​បោះពុម្ព​ដែលបាន​រក្សាទុក 1។ @@ -6823,6 +6824,7 @@ ក្រុម - - ប្រអប់តភ្ជាប់ Google Cloud Print +ប្រតិកម្មប៉ះ បោះពុម្ព​ជា​រូបភាព ទិន្នន័យ​កម្មវិធី​អាចជា​ទិន្នន័យ​ទាំងឡាយ​ដែលកម្មវិធី​បាន​រក្សាទុក (ផ្អែកលើ​ការកំណត់​របស់​អ្នកអភិវឌ្ឍន៍) រួមទាំង​ទិន្នន័យ​ដូចជា ទំនាក់ទំនង សារ និង​រូបថត​ជាដើម។ ទិន្នន័យ​បម្រុងទុក​នឹងមិន​ពាក់ព័ន្ធ​ជាមួយ​ចំនួន​កំណត់នៃ​ទំហំផ្ទុក​នៅក្នុង​ថាស​របស់កូន​អ្នក​ទេ។ diff --git a/chrome/app/resources/generated_resources_kn.xtb b/chrome/app/resources/generated_resources_kn.xtb index d6226c00a89bd7..90b0880e827f42 100644 --- a/chrome/app/resources/generated_resources_kn.xtb +++ b/chrome/app/resources/generated_resources_kn.xtb @@ -1730,7 +1730,6 @@ ನಂತರ ಅಲ್ಲ ಡೀಬಗ್ ನಿಮ್ಮ ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ -ನನ್ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ ಕುಗ್ಗಿಸಲಾಗಿದೆ ಸರಿ ಮರುಪ್ರಾಪ್ತಿ ಟರ್ಮಿನಲ್ ಅನ್ನು ತೆರೆಯಿರಿ @@ -1859,7 +1858,6 @@ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಚಿತ್ರವನ್ನು ಹೊಂದಿಸಿ ಪ್ರೋಗ್ರಾಂಗಳ ಸ್ಕ್ರೀನ್‌ಶಾಟ್ ಅನ್ನು ಪ್ರಸ್ತುತ ಸ್ಕ್ರೀನ್‌ ಮೇಲೆ ತೋರಿಸಲಾಗಿದೆ ಪವರ್ ಸೋರ್ಸ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ... -ಗೌಪ್ಯತೆ ಪರಿಶೀಲನೆ ಪಿನ್ ಮಾಡಿದ ಟ್ಯಾಬ್ ಅಂತೆ ತೆರೆಯಿರಿ ಈ ವಿಸ್ತರಣೆಯ ಅವಧಿಯು ಮುಕ್ತಾಯಗೊಂಡಿದೆ ಮತ್ತು ಎಂಟರ್‌ಪ್ರೈಸ್ ನೀತಿಯಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಹೊಸ ಆವೃತ್ತಿಯು ಲಭ್ಯವಿರುವಾಗ ಇದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಭ್ಯವಾಗುವಂತೆ ಮಾಡಲಾಗುತ್ತದೆ. ಸೈಟ್ @@ -2405,7 +2403,6 @@ Windows ಅನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು Parallels Desktop ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ. ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಹಲವಾರು ವೆಬ್‌ಸೈಟ್‌ಗಳಲ್ಲಿ ಓದಿ ಈ ಫೈಲ್ ಸೂಕ್ಷ್ಮ ವಿಷಯವನ್ನು ಒಳಗೊಂಡಿದೆ. -ಒಂದೇ ಸ್ಥಳದಲ್ಲಿ ಅತ್ಯಂತ ನಿರ್ಣಾಯಕ ಗೌಪ್ಯತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅರ್ಥಮಾಡಿಕೊಳ್ಳಿ ಮತ್ತು ಪರಿಶೀಲಿಸಿ ಮೂರನೇ-ವ್ಯಕ್ತಿಯ ಎಲ್ಲ ಕುಕೀಗಳನ್ನು ನಿರ್ಬಂಧಿಸು Google Chrome ಹಾಗೂ Chrome OS ಹೆಚ್ಚುವರಿ ನಿಯಮಗಳು ಖಾತೆಯನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ @@ -3337,6 +3334,7 @@ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸು , ನಿಮ್ಮ ನಿರ್ವಾಹಕರಿಗೆ ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ನೀವು ಬದಲಾಯಿಸವುದು ಅಗತ್ಯವಿರುತ್ತದೆ. ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ USB ಅಥವಾ ಬ್ಲೂಟೂತ್ ಸ್ವಿಚ್ ನಿಮ್ಮ Chromebook ಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನೀವು ಕೀಬೋರ್ಡ್ ಕೀಗಳನ್ನು ಸಹ ಬಳಸಬಹುದು. +ಫಿಶಿಂಗ್ ಮತ್ತು ಮಾಲ್‌ವೇರ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು ವರ್ಧಿತ ಸುರಕ್ಷತೆ ಹೆಚ್ಚಿನ ಸಹಾಯ ಮಾಡುತ್ತದೆ ದೃಢೀಕರಣದ ಕೋಡ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ... ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಲೇಔಟ್ ವಾಲ್ಯೂಮ್ diff --git a/chrome/app/resources/generated_resources_ko.xtb b/chrome/app/resources/generated_resources_ko.xtb index e971443c17fd6f..77e9f191cd6b10 100644 --- a/chrome/app/resources/generated_resources_ko.xtb +++ b/chrome/app/resources/generated_resources_ko.xtb @@ -1738,7 +1738,6 @@ 만료: 디버그 접근성 설정 변경 -내 설정 검토 음각 확인 복구 터미널 열기 @@ -1867,7 +1866,6 @@ 프로필 사진 설정 현재 화면에 표시된 프로그램의 스크린샷 전원 확인 중... -개인 정보 보호 검토 고정 탭으로 열기 이 확장 프로그램은 오래된 것이며 기업 정책에 의해 중지되었습니다. 새로운 버전이 있는 경우 자동으로 사용 설정될 수 있습니다. 사이트 @@ -2413,7 +2411,6 @@ Windows를 설치하려면 Parallels Desktop을 실행하세요. 다수의 웹사이트에서 데이터 읽기 민감한 콘텐츠가 있는 파일입니다. -한곳에서 가장 중요한 개인 정보 보호 설정을 확인하고 검토하세요. 모든 타사 쿠키 차단 Chrome 및 Chrome OS 추가 약관 계정 업데이트 @@ -3342,6 +3339,7 @@ 설정 복원 님, 관리자가 비밀번호 변경을 요청했습니다. 시작하려면 USB 또는 블루투스 스위치가 Chromebook에 연결되어 있는지 확인하세요. 키보드 키를 사용할 수도 있습니다. +향상된 보호 기능이 피싱 및 멀웨어를 더욱 효과적으로 차단합니다. 확인 코드 확인 중… 실제 키보드 레이아웃 볼륨 diff --git a/chrome/app/resources/generated_resources_ky.xtb b/chrome/app/resources/generated_resources_ky.xtb index 3513c95dc275a5..90b0f577960c78 100644 --- a/chrome/app/resources/generated_resources_ky.xtb +++ b/chrome/app/resources/generated_resources_ky.xtb @@ -1742,7 +1742,6 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу Кийин эмес Мүчүлүштүктөрдү аныктоо Атайын мүмкүнчүлүктөр жөндөөлөрүн өзгөртүңүз -Жөндөөлөрүмдү карап чыгуу Ныгырылган Ok Калыбына келтирүү терминалын ачуу @@ -1871,7 +1870,6 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу Профилиңиздин сүрөтүн коюп алыңыз Экрандагы программалардын скриншоту Кубат булактары текшерилүүдө... -Купуялыкты карап чыгуу Кадалган өтмөк катары ачуу Бул кеңейтүү эскирип, ишкана саясаты аркылуу өчүрүлгөн. Ал жаңыраак версия жеткиликтүү болгондо автоматтык түрдө иштетилиши мүмкүн. Сайт @@ -2419,7 +2417,6 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу Windows'ту орнотуу үчүн Parallels Desktop кызматын иштетиңиз. Дайын-даректериңизди бир нече вебсайттан окуңуз Бул файлда купуя мазмун бар -Эң маанилүү купуялык жөндөөлөрүн бир жерден карап чыгып, түшүнө аласыз Үчүнчү тараптын бардык cookie файлдарын бөгөттөө Google Chrome жана Chrome OS'тун кошумча шарттары Аккаунтту жаңыртуу @@ -3351,6 +3348,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу Жөндөөлөрдү калыбына келтирүү , администраторуңуз сырсөздү өзгөртүүнү талап кылууда. Баштоо үчүн USB же Bluetooth которгучу Chromebook'ка туташып турганын текшериңиз. Баскычтопту да колдонсоңуз болот. +Өркүндөтүлгөн коргоо параметри фишинг жана кесепеттүү программалардан жакшыраак коргойт Ырастоо коду текшерилүүдө… Аппараттык баскычтоп калыбы Үндүн катуулугу @@ -6820,6 +6818,7 @@ Family Link колдонмосун түзмөгүңүзгө орнотуп, бу Жарактуу электрондук почта дарегин киргизиңиз Айрым сайттар үчүн жеткиликтүү USB баскычтобу туташып турат +Издөө тилкеси Мөөнөтү аяктаган жыл Силкилдеген Түзмөктөрдү &текшерүү diff --git a/chrome/app/resources/generated_resources_lo.xtb b/chrome/app/resources/generated_resources_lo.xtb index e7bba52c2a377d..6c0b51fa604c2a 100644 --- a/chrome/app/resources/generated_resources_lo.xtb +++ b/chrome/app/resources/generated_resources_lo.xtb @@ -1739,7 +1739,6 @@ ບໍ່ຫຼັງຈາກ ແກ້ໄຂບັນຫາ ປ່ຽນການຕັ້ງຄ່າຄວາມສາມາດເຂົ້າຫາຂອງທ່ານ -ກວດສອບການຕັ້ງຄ່າຂອງຂ້ອຍ ຫຼຸດລົງ ຕົກລົງ ເປີດປາຍທາງການກູ້ຄືນ @@ -1868,7 +1867,6 @@ ຕັ້ງຄ່າຮູບໂປຣໄຟລ໌ຂອງທ່ານ ພາບໜ້າຈໍຂອງໂປຣແກຣມທີ່ປັດຈຸບັນຢູ່ໃນໜ້າຈໍ ກຳລັງກວດແຫຼ່ງພະລັງງານ... -ກວດສອບຄວາມເປັນສ່ວນຕົວ ເປີດ​ເປັນ​ແຖບປັກໝຸດແລ້ວ ສ່ວນ​ຂະ​ຫຍາຍ​ນີ້​ຫຼ້າ​ສະ​ໄໝ ແລະ​ຖືກ​ປິດ​ໃຊ້​ງານ​ຕາມ​ນະ​ໂຍ​ບາຍ​ວິ​ສາ​ຫະ​ກິດ​ແລ້ວ. ມັນ​ອາດ​ຈະ​ຖືກ​ເປີດ​ໃຊ້​ງານ​ອັດ​ຕະ​ໂນ​ມັດ ເມື່ອ​ມີ​ເວີ​ຊັນ​ໃໝ່​ກວ່າ​ໃຫ້. ເວັບ​ໄຊທ໌ @@ -2416,7 +2414,6 @@ ກະລຸນາເປີດໃຊ້ Parallels Desktop ເພື່ອຕິດຕັ້ງ Windows. ອ່ານ​ຂໍ້​ມູນ​ຂອງ​ທ່ານ​ຢູ່​ເທິງຫຼາຍ​ເວັບ​ໄຊ​ທ໌ ໄຟລ໌ນີ້ມີເນື້ອຫາລະອຽດອ່ອນ -ເຂົ້າໃຈ ແລະ ກວດສອບການຕັ້ງຄ່າຄວາມເປັນສ່ວນຕົວທີ່ສຳຄັນທີ່ສຸດໃນບ່ອນດຽວ ບລັອກຄຸກກີ້ພາກສ່ວນທີສາມທັງໝົດ ຂໍ້ກຳນົດເພີ່ມເຕີມຂອງ Google Chrome ແລະ Chrome OS ອັບເດດບັນຊີ @@ -3348,6 +3345,7 @@ ກູ້ຄືນການຕັ້ງຄ່າ , ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານກຳນົດໃຫ້ທ່ານປ່ຽນລະຫັດຜ່ານຂອງທ່ານ. ເພື່ອເລີ່ມຕົ້ນ, ກະລຸນາກວດໃຫ້ແນ່ໃຈວ່າປຸ່ມ USB ຫຼື Bluetooth ຂອງທ່ານເຊື່ອມຕໍ່ກັບ Chromebook ຂອງທ່ານຢູ່. ນອກນັ້ນທ່ານຍັງສາມາດໃຊ້ປຸ່ມໃນແປ້ນພິມໄດ້ນຳ. +ການປົກປ້ອງທີ່ປັບປຸງດີຂຶ້ນເຮັດໄດ້ຫຼາຍກວ່າໃນການບລັອກການຫຼອກເອົາຂໍ້ມູນ ແລະ ເມົາແວ ກຳລັງຢັ້ງຢືນລະຫັດຢືນຢັນຢູ່... ໂຄງຮ່າງແປ້ນພິມພາຍນອກ ລະດັບສຽງ diff --git a/chrome/app/resources/generated_resources_lt.xtb b/chrome/app/resources/generated_resources_lt.xtb index 4e728144a81f9c..56b538ef39c8c9 100644 --- a/chrome/app/resources/generated_resources_lt.xtb +++ b/chrome/app/resources/generated_resources_lt.xtb @@ -1741,7 +1741,6 @@ ir „Ctrl“ + „Alt“ + šviesumo didinimo klavišus, kad tolintumėte.Iki Derinti Keisti pasiekiamumo nustatymus -Peržiūrėti nustatymus Įdubęs Gerai Atidaryti atkūrimo terminalą @@ -1870,7 +1869,6 @@ ir „Ctrl“ + „Alt“ + šviesumo didinimo klavišus, kad tolintumėte.Profilio nuotraukos nustatymas Šiuo metu ekrane rodomų programų ekrano kopija Tikrinami maitinimo šaltiniai... -Privatumo peržiūra Atidaryti kaip prisegtą skirtuką Plėtinys pasenęs ir neleidžiamas pagal įmonės politiką. Atsiradus naujesnei versijai, jis gali būti įgalintas automatiškai. Svetainė @@ -2416,7 +2414,6 @@ ir „Ctrl“ + „Alt“ + šviesumo didinimo klavišus, kad tolintumėte.Norėdami įdiegti „Windows“ paleiskite „Parallels Desktop“. Skaityti duomenys daugybėje svetainių Šiame faile yra neskelbtino turinio -Supraskite ir peržiūrėkite svarbiausius privatumo nustatymus vienoje vietoje Blokuoti visus trečiosios šalies slapukus „Google Chrome“ ir „Chrome“ OS papildomos sąlygos Atnaujinti paskyrą @@ -3347,6 +3344,7 @@ Ar norite paleisti „“? Atkurti nustatymus , jūsų administratoriui reikia pakeisti jūsų slaptažodį. Jei norite pradėti, įsitikinkite, kad USB arba „Bluetooth“ jungiklis prijungtas prie „Chromebook“. Taip pat galite naudoti klaviatūros klavišus. +Naudojant sustiprintą apsaugą pasitelkiama papildomų priemonių sukčiavimui ir kenkėjiškoms programoms užblokuoti Patvirtinamas patvirtinimo kodas... Fizinės klaviatūros išdėstymas Apimtis diff --git a/chrome/app/resources/generated_resources_lv.xtb b/chrome/app/resources/generated_resources_lv.xtb index 5046cd49a89703..4b84fbcf74f9f8 100644 --- a/chrome/app/resources/generated_resources_lv.xtb +++ b/chrome/app/resources/generated_resources_lv.xtb @@ -1725,7 +1725,6 @@ bet, lai tālinātu, nospiediet Ctrl + Alt + spilgtuma samazināšanas tausti Nevis pēc Atkļūdot Mainītu jūsu pieejamības iestatījumus -Pārskatīt iestatījumus Pazemināta Labi Atvērt atkopšanas termināli @@ -1854,7 +1853,6 @@ bet, lai tālinātu, nospiediet Ctrl + Alt + spilgtuma samazināšanas tausti Profila attēla iestatīšana Ekrānā pašlaik redzamo programmu ekrānuzņēmums Notiek barošanas avotu pārbaude... -Konfidencialitātes iestatījumu pārskatīšana Atvērt kā piespraustu cilni Šis paplašinājums ir novecojis, un uzņēmuma politika to ir atspējojusi. Kad būs pieejama jaunāka versija, iespējams, paplašinājums tiks automātiski iespējots. Vietne @@ -2400,7 +2398,6 @@ Saskaņā ar domēna prasībām viedkartei ir jābūt ievie Lai instalētu Windows, palaidiet Parallels Desktop. Lasīt jūsu datus vairākās vietnēs Šis fails ietver sensitīvu saturu. -Izprotiet un vienuviet pārskatiet vissvarīgākos konfidencialitātes iestatījumus. Bloķēt visus trešo pušu sīkfailus Google Chrome un Chrome OS papildu noteikumi Atjaunināt kontu @@ -3331,6 +3328,7 @@ Vai vēlaties palaist rīku ?Atjaunot iestatījumus , jūsu administrators pieprasa paroles maiņu. Lai sāktu darbu, gādājiet, lai jūsu USB vai Bluetooth slēdzis būtu pievienots Chromebook datoram. Varat arī izmantot tastatūras taustiņus. +Uzlabotā aizsardzība labāk bloķē pikšķerēšanas mēģinājumus un ļaunprātīgu programmatūru Notiek apstiprinājuma koda verifikācija... Fiziskās tastatūras izkārtojums Skaļums diff --git a/chrome/app/resources/generated_resources_mk.xtb b/chrome/app/resources/generated_resources_mk.xtb index 35639af54a2b5d..cec29b5b86159c 100644 --- a/chrome/app/resources/generated_resources_mk.xtb +++ b/chrome/app/resources/generated_resources_mk.xtb @@ -1743,7 +1743,6 @@ Не отпосле Отстранете грешка Променете ги поставките за пристапност -Преглед на моите поставки Со спуштен раб Во ред Отвори го терминалот за враќање @@ -1872,7 +1871,6 @@ Поставете ја сликата на профилот Слика од екранот со прикажаните програми Се проверуваат изворите за напојување… -Преглед на приватноста Отвори како прикачена картичка Оваа наставка е застарена и оневозможена од правилата на компанијата. Можеби автоматски ќе се овозможи штом понова верзија стане достапна. Локација @@ -2420,7 +2418,6 @@ Стартувајте Parallels Desktop за да инсталирате Windows. Читајте ги вашите податоци на голем број веб-локации Датотекава содржи чувствителни содржини -Разберете ги и прегледајте ги најкритичните поставки за приватност на едно место Блокирајте ги сите колачиња од трети страни Дополнителни услови на Google Chrome и Chrome OS Ажурирајте ја сметката @@ -3352,6 +3349,7 @@ Обнови поставки , администраторот бара да ја смените лозинката. За да започнете, проверете дали прекинувачот за USB или Bluetooth е поврзан со вашиот Chromebook. Може да ги користите и копчињата на тастатурата. +„Подобрената заштита“ помага при блокирање кражби на идентитетот и злонамерен софтвер Се потврдува кодот за потврда… Распоред на физичката тастатура Гласност diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb index 997ee1d8d44e37..c19b81300639b9 100644 --- a/chrome/app/resources/generated_resources_ml.xtb +++ b/chrome/app/resources/generated_resources_ml.xtb @@ -1726,7 +1726,6 @@ അതിനുശേഷമല്ല ഡീബഗ് ചെയ്യുക നിങ്ങളുടെ ഉപയോഗസഹായി ക്രമീകരണങ്ങൾ മാറ്റുക -എന്റെ ക്രമീകരണം അവലോകനം ചെയ്യുക താഴ്ന്ന് നിൽക്കുന്നത് ശരി വീണ്ടെടുക്കൽ ടെർമിനൽ തുറക്കുക @@ -1855,7 +1854,6 @@ നിങ്ങളുടെ പ്രൊഫൈല്‍ ചിത്രം സജ്ജമാക്കുക നിലവിൽ സ്ക്രീനിലുള്ള പ്രോഗ്രാമുകളുടെ സ്ക്രീൻ ഷോട്ട് ഊർജ സ്രോതസ്സുകൾ പരിശോധിക്കുന്നു... -സ്വകാര്യതാ അവലോകനം പിന്‍ ചെയ്‌ത ടാബായി തുറക്കുക ഈ വിപുലീകരണം എന്റർപ്രൈസ്‌ നയം ഉപയോഗിച്ച് കാലഹരണപ്പെടുത്തുകയും പ്രവർത്തനരഹിതമാക്കുകയും ചെയ്‌തു. പുതിയ പതിപ്പ് ലഭ്യമാകുമ്പോൾ അത് സ്വയമേവ പ്രവർത്തനക്ഷമമായേക്കാം. സൈറ്റ് @@ -2403,7 +2401,6 @@ Windows ഇൻസ്‌റ്റാൾ ചെയ്യാൻ Parallels Desktop ലോഞ്ച് ചെയ്യുക. നിരവധി വെബ്‌സൈറ്റുകളിലെ നിങ്ങളുടെ വിവരം വായിക്കുക ഈ ഫയലിൽ സൂക്ഷ്‌മമായി കൈകാര്യം ചെയ്യേണ്ട ഉള്ളടക്കം അടങ്ങിയിരിക്കുന്നു -ഏറ്റവും പ്രധാനപ്പെട്ട സ്വകാര്യതാ ക്രമീകരണങ്ങൾ ഒരിടത്ത് നിന്ന് തന്നെ മനസ്സിലാക്കുക, അവലോകനം ചെയ്യുക എല്ലാ മൂന്നാം-കക്ഷി കുക്കികളും തടയുക Google Chrome, Chrome OS അധിക നിബന്ധനകൾ അക്കൗണ്ട് അപ്‌ഡേറ്റ് ചെയ്യുക @@ -3334,6 +3331,7 @@ ക്രമീകരണം പുനഃസ്ഥാപിക്കുക , അഡ്‌മിൻ നിങ്ങളുടെ പാസ്‌വേഡ് മാറ്റാൻ ആവശ്യപ്പെടുന്നു. ആരംഭിക്കാൻ, നിങ്ങളുടെ USB അല്ലെങ്കിൽ Bluetooth സ്വിച്ച് Chromebook-ലേക്ക് കണക്റ്റ് ചെയ്തിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക. നിങ്ങൾക്ക് കീബോർഡ് കീകളും ഉപയോഗിക്കാം. +ഫിഷിംഗും മാല്‍വെയറും ബ്ലോക്ക് ചെയ്യുന്നതിന് മെച്ചപ്പെടുത്തിയ പരിരക്ഷ കൂടുതൽ കാര്യങ്ങൾ ചെയ്യുന്നു സ്ഥിരീകരണ കോഡ് പരിശോധിച്ചുറപ്പിക്കുന്നു... ഫിസിക്കൽ കീബോർഡ് ലേഔട്ട് അളവ് diff --git a/chrome/app/resources/generated_resources_mn.xtb b/chrome/app/resources/generated_resources_mn.xtb index 3cc1c3a352a21a..5b08002e598618 100644 --- a/chrome/app/resources/generated_resources_mn.xtb +++ b/chrome/app/resources/generated_resources_mn.xtb @@ -252,6 +252,7 @@ Linux-г одоогоор сэргээж байна Өргөтгөлийн алдаа -г суулгаж чадсангүй: Зургийн URL алдааны кодыг буцаасан. Админтайгаа холбогдоно уу. +-р төхөөрөмж, гэсэн нэртэй таблет Хээтэй хаалтыг нээхээр хүлээж байсан Энэ нь сайтууд болон суулгасан аппуудын хадгалсан -н өгөгдлийг арилгана Мобайл дата сүлжээг скан хийж байна... @@ -438,6 +439,7 @@ -г сонгосон Идэвхтэй Kerberos тасалбарыг тохируулах Энэ тохиргоог төхөөрөмжийн эзэмшигч удирддаг, . +-р төхөөрөмж, гэсэн нэртэй утас Энэ загварт зориулан -г татах үйлдэл амжилтгүй болсон байна. Оноолтыг баталгаажуулахын тулд “” дээр дахин дарж, Веб хуудас, Нэг файл @@ -866,6 +868,7 @@ Камер асаалттай байна Байршил нэмэх... Програм хангамж боловсруулагчийг тодорхойлох итгэмжлэлийг энэ сертификатад олгох +-р төхөөрөмж, гэсэн нэртэй үл мэдэгдэх төхөөрөмж Энэ фолдер хоосон байна Танд суулгасан ямаг нэг тусгай VPN, прокси, галт хана эсвэл NAS программ хангамж байгаа юу? @@ -1241,6 +1244,7 @@ Файлын мэдээлэл Google-с зургийн тайлбар авах уу? Таны төхөөрөмжийг танай байгууллагаас удирддаг +-р төхөөрөмж, гэсэн нэртэй тоглоомын гар Табтай цонх хэлбэрээр нээх жишээ нь, 1-5, 8, 11-13 Системийн харагчаар нээх @@ -1734,7 +1738,6 @@ Дараа нь биш Алдааг засах Өөрийнхөө нэвтрэх боломжит байдлын тохиргоонуудыг өөрчлөх -Tохиргоогоо шалгах Дарагдсан OK Сэргээх терминалыг нээх @@ -1863,7 +1866,6 @@ Профайл зургаа тохируулах Одоогоор дэлгэц дээр байгаа програмуудын дэлгэцийн зураг Тэжээлийн эх сурвалжийг шалгаж байна... -Нууцлалын шалгалт Тусгайлан сонгосон цонх хэлбэрээр нээх Энэхүү өргөтгөлийг байгууллагын бодлого журмын дагуу ашиглахгүй мөн идэвхгүй болгосон байна.Шинэ хувилбар гарсан тохиолдолд энэхүү өргөтгөл нь автоматаар идэвхижих магадлалтай болно. Ажлын талбар @@ -2004,6 +2006,7 @@ Табыг хуулбарлах дээрээ Linux-н хэрэгсэл, засварлагч болон IDE-г ажиллуулах. Нэмэлт мэдээлэл авах Зөвшөөрлийг шинэчлэх +-р төхөөрөмж, гэсэн нэртэй аудио төхөөрөмж {NUM_DAYS,plural, =1{ танаас өнөөдөр Wi-Fi-д холбогдож, шинэчлэлт татаж авахыг шаардаж байна. Эсвэл хязгаартай холболтоос татаж авна уу (төлбөр гарч болзошгүй).}other{ танаас эцсийн хугацаанаас өмнө Wi-Fi-д холбогдож, шинэчлэлт татаж авахыг шаардаж байна. Эсвэл хязгаартай холболтоос татаж авна уу (төлбөр гарч болзошгүй).}} Та гар утасны өгөгдлийн үйлчилгээний тохиргоо хийх явцыг цуцлахыг хүсэж байгаа гэдэгтээ итгэлтэй байна уу? Индексжүүлсэн мэдээллийн сан @@ -2309,6 +2312,7 @@ Зөөврийн төхөөрөмж илэрсэн байна Санал болгож буй эможи. Дээш эсвэл доош дарж шилжээд, enter дарж оруулна. Санах ойн ул мөр + төхөөрөмжтэй хослуулж чадсангүй. Дахин оролдохын тулд төхөөрөмж сонгоно уу Холболтын алдаа Бүрэн Гэрчилгээ бодлогын хязгаарлалтууд @@ -2409,7 +2413,6 @@ Windows-г суулгахын тулд Parallels Desktop-г эхлүүлнэ үү. Олон тооны веб хуудсууд дээр байгаа өөрийнхөө мэдээллийг уншина уу Энэ файл эмзэг контенттой байна -Нууцлалын хамгийн чухал тохиргоог нэг дороос ойлгож, шалгана уу Гуравдагч талын бүх күүкиг блоклох Google Chrome болон Chrome үйлдлийн системийн нэмэлт нөхцөл Бүртгэл шинэчлэх @@ -2517,6 +2520,7 @@ Family Link-р веб сайтын хязгаарлалт, дэлгэцийн цагийн хязгаар тогтоох Удирдамжийг төхөөрөмж дээр суулгаж чадсангүй. Ойролцоогоор үлдсэн +Дэлгэцийг хуваах болон дэлгэц сэлгэх зэрэг үйлдэлд чичиргээтэй баталгаажуулалт хүлээн авна уу. &Зөв бичгийн алдаа шалгагч Энэ боловсруулалтад хэдэн минут шаардлагатай. Linux-н контейнерыг тохируулж байна. Утаснаасаа саяхны Chrome табуудыг харах @@ -3139,6 +3143,7 @@ Өөрчлөх үг Шинэ &цонх Та синк хийх зүйлээ хүссэн үедээ тохиргооноос сонгож болно +Сайжруулсан аюулгүй хөтчийн тусламжтай та Chrome-н хамгийн хүчирхэг хамгаалалтыг авна Дэлгэц амраагчийг унтраах Харь гарагийн хүн Санал хүсэлтийн тайлан @@ -3339,6 +3344,7 @@ Тохиргоог сэргээх , таны админ нууц үгээ солихыг шаардаж байна. Эхлүүлэхийн тулд USB эсвэл Bluetooth сэлгэгчээ Chromebook-тэйгээ холбогдсон эсэхийг шалгана уу. Та мөн гарын товчнуудыг ашиглах боломжтой. +Сайжруулсан хамгаалалт нь фишинг болон хортой кодыг блоклохын тулд илүү ихийг хийдэг Баталгаажуулах кодыг бататгаж байна... Биет гарын бүдүүвч Хэмжээ @@ -3644,6 +3650,7 @@ Таталтууд: Микрофоноо ашигла Төхөөрөмжийн дискний багтаамж маш бага байна +-c -р төхөөрөмж, гэсэн нэртэй компьютер Таныг энэ хуудсыг харахад дараах күүкийг тохируулсан Андройд Мессежийг таны утаснаас таны Chromebook-д мессеж илгээхийг зөвшөөрдөг Танд эдгээр байгууллагаас таныг тодорхойлох сертификат байна @@ -3825,6 +3832,7 @@ "" цуваа портод холбогдох хүсэлтэй байна Энэ нотолгооны үйлчилгээг -с удирддаг Хурууны хээ тохируулахын тулд хүүхдээ асаах/унтраах товчинд хүргэнэ үү. Таны хүүхдийн хурууны хээний өгөгдлийг аюулгүй хадгалдаг бөгөөд энэ -с хэзээ ч гардаггүй. +Та стандарт хамгаалалт авч байна {COUNT,plural, =1{1 файл}other{# файл}} Авах арга хэмжээ Өгөгдмөл улбар шар аватар @@ -4408,6 +4416,7 @@ Демо бүртгэлийн хүсэлтэд алдаа гарлаа. Төхөөрөмжийг дахин ачаалах тохиолдолд энэхүү үйлдэл нь таны Google хаяг эсвэл түүнд тохируулсан аливаа өгөгдөлд ямар нэгэн хэлбэрээр үл нөлөөлөх боловч дотоод орчинд хадгалсан таны бүх файл устах болно. Автоматаар нэвтрэх + хэлний орчуулга дууслаа Microsoft Windows программын баталгаажуулалт Төхөөрөмжийг домэйнд нэгтгэх боломжгүй. Дахин оролдоно уу эсвэл төхөөрөмж өмчлөгч, администратортайгаа холбогдоно уу. Алдааны код: . Үндсэн цэс @@ -4912,6 +4921,7 @@ Утсаа шалгана уу Chrome хөтөч болон -н эхлүүлэгчид өгөгдмөл хайлтын системээ тохируулна уу Smart Lock-г ашиглахын тулд утсан дээрээ үндсэн хэрэглэгчийн профайл руу сэлгэнэ үү +Эдгээр логийг дараахаар Миний файлуудад хадгалсан байна Хэл болон оролтын тохиргоог өөрчлөх Төхөөрөмжийг гэж нэрлэх Эхлүүлэх дэлгэц дээр энэ хуудсыг тусгайлан сонгож оруул... @@ -5688,6 +5698,7 @@ Гадаад аюулгүй байдлын түлхүүр эсвэл бүрэлдэхүүн мэдрэгч {NUM_EXTENSIONS,plural, =1{Өргөтгөлийг зөвшөөрөөгүй}other{# өргөтгөлийг зөвшөөрөөгүй}} Дэвшүүлж дууслаа +Товшилтын хүч Цаасны тэвш алга байна Бичих үйлдэл нь атрибутын уртаас хэтэрсэн байна: "". Танд хадгалсан 1 хэвлэгч байна. @@ -5821,6 +5832,7 @@ {NUM_MINS,plural, =1{Аюулгүй байдлын шалгалтыг 1 минутын өмнө хийсэн}other{Аюулгүй байдлын шалгалтыг {NUM_MINS} минутын өмнө хийсэн}} Аппын өгөгдлийг авч чадсангүй, ямартай ч аппыг ажиллуулахыг оролдож байна... Нуусан сүлжээ +-р төхөөрөмж, гэсэн нэртэй хулгана Автоматаар эхлүүлэх тохиргоог хийх Сүүлд хаасан сайтыг өгөгдлийг гүйцэт илгээх, хүлээн авахыг зөвшөөрөх (санал болгосон) Богино холбоосыг боловсруулж байна... @@ -5984,6 +5996,7 @@ Wi-Fi сүлжээ Хэвлэх үйлчилгээ Өөрийн хуулж, наасан өгөгдлийг уншуул +-р төхөөрөмж, гэсэн нэртэй видео камер Хувиргалт Хэрэглээний программ хариу өгөхгүй байна. Аппыг хаахын тулд "Хүчээр хаах"-г сонгоно уу. Энэ нэвтрэх үйлчилгээг -с хост хийсэн @@ -6777,6 +6790,7 @@ Нэгтгэсэн яриаг ашиглан яригдсан бүх текстийг унш Асуух (өгөгдмөл) Файл +-р төхөөрөмж, гэсэн нэртэй гар Санал хүсэлт илгээх Текстийн бүдэгрэл хариу өгөхгүй байна. @@ -6814,6 +6828,7 @@ бүлэг - - Холболтын харилцах цонх Google Cloud Print +Мэдрэгдэх хариу Зургаар хэвлэх Аппын өгөгдөл нь аппын хадгалсан дурын өгөгдөл (хөгжүүлэгчийн тохиргоонд үндэслэн) байж болох бөгөөд үүнд харилцагчид, мессеж болон зураг зэрэг өгөгдөл багтана. Нөөцлөлтийн өгөгдөл нь таны хүүхдийн Драйвын хадгалах сангийн багтаамжид нөлөөлөхгүй. @@ -6915,6 +6930,7 @@ Таны хавчуурга, нууц үг, түүх болон бусад зүйлийг бүх төхөөрөмж дээр тань синк хийдэг Агуулга {NUM_TABS,plural, =1{Унших жагсаалтад Таб нэмэх}other{Унших жагсаалтад Табууд нэмэх}} +Буцааж асаах Бүх картыг нуух Төхөөрөмжийн мэдээлэл Google Драйвт нөөцлөх. Өгөгдлийг хялбархнаар сэргээж эсвэл хүссэн үедээ төхөөрөмжийг сэлгээрэй. Энэ нөөцлөлтөд аппын өгөгдөл багтдаг. Нөөцлөлтийг Google-д байршуулдаг бөгөөд таны хүүхдийн Google Бүртгэлийн нууц үгийг ашиглан шифрлэдэг. Нэмэлт мэдээлэл авах @@ -6988,6 +7004,7 @@ Төхөөрөмжүүддээ илгээх Таны орны хэлээр байхгүй хуудсыг орчуулах санал хүргүүлнэ үү Яг одоо дахин ачаалах +-тай хослуулж байна Жижиг зураг устгагдсан. Үргэлж бүтэн URL-г харуулах Байршуулж байна... @@ -7225,9 +7242,11 @@ Хэл нэмэх Нэвтэрч байна Шуурхай модем болгох холболт амжилтгүй боллоо +Сайжруулсан аюулгүй хөтөч унтраалттай байна Уучлаарай, домайнд нэгдэхэд алдаа гарлаа. Дахин оролдоно уу. Нетскейп гэрчилгээг шинэчлэх холбоос Товч дарахад дуу гарах +Буцааж асаах Үгүй (HttpOnly) Дэвшүүлэх Зөв форматтай URL оруулна уу diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb index 255876a02bd3e9..1e38424eab1e14 100644 --- a/chrome/app/resources/generated_resources_mr.xtb +++ b/chrome/app/resources/generated_resources_mr.xtb @@ -1737,7 +1737,6 @@ नंतर नाही डीबग तुमच्या ॲक्सेसिबिलिटी सेटिंग्ज बदला -माझ्या सेटिंग्जचे पुनरावलोकन करा डिप्रेस्ड ठीक आहे रिकव्हरी टर्मिनल उघडा @@ -1866,7 +1865,6 @@ तुमचे प्रोफाइल चित्र सेट करा सध्या स्क्रीनवर असलेल्या प्रोग्रामचे स्क्रीनशॉट पॉवर स्रोत तपासत आहे… -गोपनीयतेचे पुनरावलोकन करणे पिन केलेला टॅब म्हणून उघडा हे एक्स्टेंशन कालबाह्य आहे आणि संस्‍था धोरणानुसार बंद केले आहे. नवीनतम आवृत्ती उपलब्‍ध झाल्‍यावर ते कदाचित आपोआप सुरू होईल. साइट @@ -2412,7 +2410,6 @@ Windows इंस्टॉल करण्यासाठी कृपया Parallels Desktop लाँच करा. अनेक वेबसाइटवर तुमचा डेटा वाचा या फाइलमध्ये संवेदनशील आशय आहे -सर्वात महत्त्वाच्या गोपनीयता सेटिंग्ज एकाच ठिकाणी समजून घ्या आणि त्यांचे पुनरावलोकन करा सर्व तृतीय-पक्ष कुकीज अवरोधित करा Google Chrome आणि Chrome OS अतिरिक्त अटी खाते अपडेट करा @@ -3341,6 +3338,7 @@ सेटिंग्ज पुनर्संचयित करा , तुम्ही तुमचा पासवर्ड बदलणे तुमच्या ॲडमिनिस्ट्रेटरलााठी आवश्यक आहे. सुरुवात करण्यासाठी, कृपया तुमचे USB किंवा ब्लूटूथ स्विच तुमच्या Chromebook शी कनेक्ट केले असल्याची खात्री करा. आपण कीबोर्ड कीदेखील वापरू शकता. +वर्धित सुरक्षितता फिशिंग आणि मालवेअर अधिक चांगल्यारितीने ब्लॉक करते कंफर्मेशन कोडची पडताळणी करत आहे… वास्तविक कीबोर्ड लेआउट व्हॉल्यूम diff --git a/chrome/app/resources/generated_resources_ms.xtb b/chrome/app/resources/generated_resources_ms.xtb index c35f255406bfeb..74ffcd56e563fd 100644 --- a/chrome/app/resources/generated_resources_ms.xtb +++ b/chrome/app/resources/generated_resources_ms.xtb @@ -1738,7 +1738,6 @@ dan Ctrl+Alt+Kurangkan kecerahan untuk zum keluar. Bukan Selepas Nyahpepijat Ubah tetapan kebolehaksesan anda -Semak tetapan saya Direndahkan Ok Buka terminal pemulihan @@ -1867,7 +1866,6 @@ dan Ctrl+Alt+Kurangkan kecerahan untuk zum keluar. Tetapkan gambar profil anda Tangkapan skrin atur cara yang sedang dipaparkan pada skrin Menyemak sumber kuasa... -Semakan privasi Buka sebagai Tab Disemat Sambungan ini sudah lapuk dan dilumpuhkan oleh dasar perusahaan. Ia mungkin menjadi aktif secara automatik apabila versi yang lebih baharu tersedia. Tapak @@ -2413,7 +2411,6 @@ dan Ctrl+Alt+Kurangkan kecerahan untuk zum keluar. Sila lancarkan Parallels Desktop untuk memasang Windows. Baca data anda di beberapa laman web Fail ini mengandungi kandungan sensitif -Fahami dan semak tetapan privasi yang paling kritikal di satu tempat Sekat semua kuki pihak ketiga Syarat Tambahan Google Chrome dan OS Chrome Kemas kini akaun @@ -3344,6 +3341,7 @@ dan Ctrl+Alt+Kurangkan kecerahan untuk zum keluar. Pulihkan Tetapan , pentadbir anda memerlukan anda untuk menukar kata laluan. Untuk bermula, sila pastikan suis USB atau Bluetooth disambungkan kepada Chromebook anda. Anda juga boleh menggunakan kekunci papan kekunci. +Perlindungan yang dipertingkatkan melakukan pelbagai lagi perkara untuk menyekat pancingan data dan perisian hasad Mengesahkan kod pengesahan... Reka letak papan kekunci fizikal Kelantangan diff --git a/chrome/app/resources/generated_resources_my.xtb b/chrome/app/resources/generated_resources_my.xtb index 42854156463520..6b1585acc8cdde 100644 --- a/chrome/app/resources/generated_resources_my.xtb +++ b/chrome/app/resources/generated_resources_my.xtb @@ -1740,7 +1740,6 @@ နောက်မှ မဟုတ်ပါ အမှားရှာပြင်ခြင်း သင်၏ ရယူသုံးနိုင်မှု ဆက်တင်များကို ပြောင်းလဲရန် -ကျွန်ုပ်၏ဆက်တင်များကို စိစစ်ရန် စာလုံးချိုင့် OK ပြန်လည်ရယူရေး တာမီနယ်ကို ဖွင့်ရန် @@ -1869,7 +1868,6 @@ သင်၏ပရိုဖိုင်ပုံ သတ်မှတ်ပါ ဖန်သားပြင်ပေါ်တွင် လက်ရှိဖွင့်ထားသော ပရိုဂရမ်များ၏ ဖန်သားပြင်ဓာတ်ပုံ ပါဝါအရင်းအမြစ်ကို စစ်ဆေးနေသည်... -ကိုယ်ရေးလုံခြုံမှု စိစစ်ခြင်း ပင်တွဲထားသည့် တဲပ်အဖြစ် ဖွင့်ရန် ဤ ပရိုဂရမ်အဆက် ခေတ်နောက်ကျနေပြီး လုပ်ငန်းမူဝါဒမှလုပ်ဆောင်မှုအားရပ်တန့်ထားပြီဖြစ်သည်။ဗားရှင်းအသစ်ရရှိနိုင်ပါက ၄င်းအား အလိုလျောက်လုပ်ဆောင်လာပါလိမ့်မည်။ ဆိုက် @@ -2417,7 +2415,6 @@ Windows ထည့်သွင်းရန် Parallels Desktop ကို ဖွင့်ပါ။ ဝဘ်ဆိုက် တသီကြီးမှ သင်၏ ဒေတာကို ဖတ်ရန် ဤဖိုင်တွင် သတိထားရသော အကြောင်းအရာ ပါဝင်သည် -အရေးအကြီးဆုံး ကန့်သတ်ဆက်တင်များကို တစ်နေရာထဲမှာပင် သိရှိနားလည်အောင်လုပ်ပြီး စိစစ်သုံးသပ်လိုက်ပါ ပြင်ပအဖွဲ့အစည်း၏ ကွတ်ကီးအားလုံးကို ပိတ်ပါ Google Chrome နှင့် Chrome OS နောက်ဆက်တွဲ စည်းမျဉ်းများ အကောင့်ကို အပ်ဒိတ်လုပ်ရန် @@ -3348,6 +3345,7 @@ ဆက်တင်များအား ပြန်ယူရန် ၊ သင်၏ စီမံခန့်ခွဲသူက သင်၏စကားဝှက်ကို ပြောင်းစေလိုပါသည်။ စတင်ရန် USB (သို့) ဘလူးတုသ်ခလုတ်ကို သင်၏ Chromebook နှင့် ချိတ်ဆက်ထားကြောင်း သေချာပါစေ။ ကီးဘုတ်ခလုတ်များကိုလည်း သုံးနိုင်သည်။ +အဆင့်မြှင့်တင်ထားသော ကာကွယ်မှုက ဖြားယောင်းမှုနှင့် မဲလ်ဝဲများကို ပိုမိုပိတ်ဆို့ပေးသည် မှန်ကြောင်းအတည်ပြုကုဒ်ကို စိစစ်နေသည်... စက်၏ကီးဘုတ် အပြင်အဆင် ပမာဏ diff --git a/chrome/app/resources/generated_resources_ne.xtb b/chrome/app/resources/generated_resources_ne.xtb index ebfb0ec77f47a6..400a9aaa51d205 100644 --- a/chrome/app/resources/generated_resources_ne.xtb +++ b/chrome/app/resources/generated_resources_ne.xtb @@ -1720,7 +1720,6 @@ पछि होइन डिबग गर्नुहोस् आफ्नो पहुँच क्षमता सेटिङहरू परिवर्तन गर्नुहोस् -म आफूले तय गरेका सेटिङको समीक्षा गर्न चाहन्छु दबेको ठिक छ रिकभरी टर्मिनल खोल्नुहोस् @@ -1849,7 +1848,6 @@ आफ्नो प्रोफाइल तस्बिर सेट गर्नुहोस् हाल स्क्रिनमा देखिएका कार्यक्रमहरूको स्क्रिनसट पावरका स्रोतहरूको जाँच गर्दै... -गोपनीयतासम्बन्धी सेटिङको समीक्षा गर्नुहोस् पिन गरिएको ट्याबको रूपमा खोल्नुहोस् यो एक्सटेन्सनको मिति सकिएको छ र उद्यम नीति द्वारा अक्षम छ। एक नयाँ संस्करण उपलब्ध भएपछि यो स्वतः सक्षम हुन सक्छ। साइट @@ -2396,7 +2394,6 @@ कृपया Windows इन्स्टल गर्न Parallels Desktop खोल्नुहोस्। विभिन्न वेबसाइटहरूमा तपाईँको डेटा पढ्नुहोस् यो फाइलमा संवेदनशील सामग्री छ -एकै ठाउँबाट गोपनीयतासम्बन्धी सबैभन्दा महत्त्वपूर्ण सेटिङका बारेमा जानकारी प्राप्त गर्नुहोस् र ती सेटिङको समीक्षा गर्नुहोस् तेस्रो पक्षीय सबै कुकीहरू ब्लक गर्नुहोस् Google Chrome र Chrome OS का अतिरिक्त सर्तहरू खाता अपडेट गर्नुहोस् @@ -3326,6 +3323,7 @@ सेटिङहरूलाई पुनर्स्थापना गर्नुहोस् , तपाईंको प्रशासकले तपाईंले आफ्नो पासवर्ड परिवतन गर्नुहोस् भन्ने चाहनुहुन्छ। सुरु गर्नका लागि, तपाईंको USB वा ब्लुटुथको स्विच Chromebook मा कनेक्ट भएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। यसका लागि तपाईं किबोर्डका कीहरू पनि प्रयोग गर्न सक्नुहुन्छ। +परिष्कृत सुरक्षा प्रयोग गरी फिसिङ तथा मालवेयरमाथि अझ राम्रोसँग रोक लगाउन सकिन्छ पुष्टि कोड पुष्टि गरिँदै छ... भौतिक किबोर्डको लेआउट आयतन diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb index 6b00d59fd66437..6a9d6e6669ed57 100644 --- a/chrome/app/resources/generated_resources_nl.xtb +++ b/chrome/app/resources/generated_resources_nl.xtb @@ -1722,7 +1722,6 @@ Als je later besluit dat je niet wilt dat je kind Voice Match gebruikt, verwijde Niet na Foutopsporing Je toegankelijkheidsinstellingen wijzigen -Mijn instellingen controleren Verlaagd OK Herstelterminal openen @@ -1851,7 +1850,6 @@ Als je later besluit dat je niet wilt dat je kind Voice Match gebruikt, verwijde Je profielfoto instellen Screenshot van programma's die momenteel op het scherm staan Voedingsbronnen controleren… -Privacycontrole Openen als vastgezet tabblad Deze extensie is verouderd en uitgezet op basis van bedrijfsbeleid. De extensie kan automatisch worden aangezet wanneer er een nieuwere versie beschikbaar komt. Site @@ -2397,7 +2395,6 @@ Als je later besluit dat je niet wilt dat je kind Voice Match gebruikt, verwijde Start Parallels Desktop om Windows te installeren. Je gegevens voor een aantal websites lezen Dit bestand bevat gevoelige content -Je kunt op 1 plaats inzicht krijgen in de meest essentiële privacyinstellingen en ze controleren Alle cookies van derden blokkeren Aanvullende voorwaarden van Google Chrome en Chrome OS Account updaten @@ -3328,6 +3325,7 @@ Als je later besluit dat je niet wilt dat je kind Voice Match gebruikt, verwijde Instellingen herstellen , de beheerder vereist dat je je wachtwoord wijzigt. Als je aan de slag wilt gaan, zorg je dat je USB- of bluetooth-schakelaar is verbonden met je Chromebook. Je kunt ook de toetsen van het toetsenbord gebruiken. +Geoptimaliseerde beveiliging die je nog beter beschermt tegen phishing en malware Bevestigingscode verifiëren... Indeling van fysiek toetsenbord Volume diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb index b5e7515647111b..c9c2dbc8e28db1 100644 --- a/chrome/app/resources/generated_resources_no.xtb +++ b/chrome/app/resources/generated_resources_no.xtb @@ -1736,7 +1736,6 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. Ikke etter Feilsøk endre innstillingene for tilgjengelighet -Gjennomgå innstillingene mine Preget OK Åpne gjenopprettingsterminalen @@ -1865,7 +1864,6 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. Angi profilbildet ditt Skjermdump av programmene som er på skjermen Sjekker strømkilder … -Personverngjennomgang Åpne som festet fane Denne utvidelsen er utdatert og avslått av bedriftsretningslinjene. Den kan slås på automatisk når en nyere versjon er tilgjengelig. Nettsted @@ -2413,7 +2411,6 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. Start Parallels Desktop for å installere Windows. Lesing av dataene dine på en rekke nettsteder Denne filen har sensitivt innhold -Forstå og gjennomgå de mest kritiske personverninnstillingene på ett sted Blokkér alle informasjonskapsler fra tredjeparter Tilleggsvilkår for Google Chrome og Chrome OS Oppdater kontoen @@ -3343,6 +3340,7 @@ og Ctrl + Alt + lysstyrke ned for å zoome ut. Gjenopprett innstillingene , administratoren din krever at du endrer passord. For å komme i gang, sørg for at USB- eller Bluetooth-bryteren er koblet til Chromebooken. Du kan også bruke tastaturtaster. +Økt beskyttelse gjør mer for å blokkere nettfisking og skadelig programvare Verifiserer bekreftelseskoden … Fysisk tastaturoppsett Volum diff --git a/chrome/app/resources/generated_resources_or.xtb b/chrome/app/resources/generated_resources_or.xtb index 1028e3ae4ba1b1..2bf7f624db0dd6 100644 --- a/chrome/app/resources/generated_resources_or.xtb +++ b/chrome/app/resources/generated_resources_or.xtb @@ -1721,7 +1721,6 @@ ପରେ ନୁହେଁ ଡିବଗ୍ କରନ୍ତୁ ଆପଣଙ୍କର ଆକ୍ସେସିବିଲିଟି ସେଟିଂସ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ -ମୋ ସେଟିଂସର ସମୀକ୍ଷା କରନ୍ତୁ ଡିପ୍ରେସ୍‌ଡ ଠିକ୍ ଅଛି ପୁନରୁଦ୍ଧାର ଟର୍ମିନାଲ୍ ଖୋଲନ୍ତୁ @@ -1850,7 +1849,6 @@ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଛବି ସେଟ୍ କରନ୍ତୁ ବର୍ତ୍ତମାନ ସ୍କ୍ରିନ୍‍‍ରେ ଥିବା ପ୍ରୋଗ୍ରାମ୍‍ଗୁଡ଼ିକର ସ୍କ୍ରିନ୍‍ସଟ୍ ପାୱାର ସୋର୍ସଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରାଯାଉଛି... -ଗୋପନୀୟତାର ସମୀକ୍ଷା ପିନ୍‌ କରାଯାଇଥିବା ଟାବ୍‌ ଭାବରେ ଖୋଲନ୍ତୁ ଏହି ଏକ୍ସଟେନ୍‌ସନ୍‌ ପୁରୁଣା ହୋ‍ଇଯାଇଛି ଏବଂ ଏଣ୍ଟର୍‌ପ୍ରାଇଜ୍ ନୀତି ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି। ଯେତେବେଳେ ଏକ ନୂତନ ସଂସ୍କରଣ ଉପଲବ୍ଧ ହେବ ଏହା ସ୍ୱଚାଳିତ ଭାବେ ସକ୍ଷମ ହୋ‍ଇପାରେ। ସାଇଟ୍ @@ -2396,7 +2394,6 @@ ଦୟାକରି Windows ଇନଷ୍ଟଲ୍ କରିବାକୁ Parallels Desktop ଲଞ୍ଚ କରନ୍ତୁ। ଅନେକଗୁଡ଼ିଏ ୱେବ୍‌ସାଇଟ୍‌ରେ ଆପଣଙ୍କର ଡାଟା ପଢ଼ନ୍ତୁ ଏହ ଫାଇଲରେ ସମ୍ବେଦନଶୀଳ ବିଷୟବସ୍ତୁ ଅଛି -ଗୋଟିଏ ସ୍ଥାନରେ ସବୁଠାରୁ ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ଗୋପନୀୟତା ସେଟିଂସକୁ ବୁଝି ସମୀକ୍ଷା କରନ୍ତୁ ସମସ୍ତ ତୃତୀୟ-ପକ୍ଷ କୁକୀକୁ ବ୍ଲକ କରନ୍ତୁ Google Chrome ଏବଂ Chrome OS ଅତିରିକ୍ତ ସର୍ତ୍ତାବଳୀ ଆକାଉଣ୍ଟ ଅପ୍‌ଡେଟ୍ କରନ୍ତୁ @@ -3326,6 +3323,7 @@ ସେଟିଂସ୍‍ ରିଷ୍ଟୋର୍‍ କରନ୍ତୁ , ଆପଣ ଆପଣଙ୍କର ପାସ୍‌ୱର୍ଡ ପରିବର୍ତ୍ତନ କରନ୍ତୁ ବୋଲି ଆପଣଙ୍କର ବ୍ୟବସ୍ଥାପକ ଚାହୁଁଛନ୍ତି। ଆରମ୍ଭ କରିବା ପାଇଁ ଦୟାକରି ଆପଣଙ୍କ USB କିମ୍ବା ବ୍ଲୁଟୁଥ୍ ସୁଇଚ୍ ଆପଣଙ୍କର Chromebook ସହ ସଂଯୋଗ ହୋଇଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ। ଆପଣ କୀ'ବୋର୍ଡର କୀ'ଗୁଡ଼ିକୁ ମଧ୍ୟ ବ୍ୟବହାର କରିପାରିବେ। +ଉନ୍ନତ ସୁରକ୍ଷା ଫିସିଂ ଓ ମାଲୱେୟାରକୁ ବ୍ଲକ୍ କରିବାକୁ ଅନେକ କିଛି କରେ ସୁନିଶ୍ଚିତକରଣ କୋଡ୍ ଯାଞ୍ଚ କରାଯାଉଛି… ଫିଜିକାଲ୍ କୀବୋର୍ଡ ଲେଆଉଟ୍ ଭଲ୍ୟୁମ୍ diff --git a/chrome/app/resources/generated_resources_pa.xtb b/chrome/app/resources/generated_resources_pa.xtb index 5dcbcd07dee6b6..acd4b5b2fbde17 100644 --- a/chrome/app/resources/generated_resources_pa.xtb +++ b/chrome/app/resources/generated_resources_pa.xtb @@ -1739,7 +1739,6 @@ ਬਾਅਦ ਵਿੱਚ ਨਹੀਂ ਡੀਬੱਗ ਆਪਣੀਆਂ ਪਹੁੰਚਯੋਗਤਾ ਸੈਟਿੰਗਾਂ ਬਦਲੋ -ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ ਨਿਰਾਸ਼ ਠੀਕ ਰਿਕਵਰੀ ਟਰਮੀਨਲ ਖੋਲ੍ਹੋ @@ -1868,7 +1867,6 @@ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਤਸਵੀਰ ਦੀ ਸੈਟਿੰਗ ਕਰੋ ਉਹਨਾਂ ਪ੍ਰੋਗਰਾਮਾਂ ਦਾ ਸਕ੍ਰੀਨਸ਼ਾਟ ਜੋ ਫਿਲਹਾਲ ਸਕ੍ਰੀਨ 'ਤੇ ਮੌਜੂਦ ਹਨ ਪਾਵਰ ਸਰੋਤਾਂ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ... -ਪਰਦੇਦਾਰੀ ਸਮੀਖਿਆ ਪਿੰਨ ਕੀਤੀ ਟੈਬ ਦੇ ਤੌਰ ਤੇ ਖੋਲ੍ਹੋ ਇਹ ਐਕਸਟੈਂਸ਼ਨ ਪੁਰਾਣੀ ਹੈ ਅਤੇ ਐਂਟਰਪ੍ਰਾਈਜ ਨੀਤੀ ਵੱਲੋਂ ਬੰਦ ਕੀਤੀ ਗਈ ਹੈ। ਇਹ ਉਦੋਂ ਸਵੈਚਲਿਤ ਤੌਰ 'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀ ਹੈ, ਜਦੋਂ ਕੋਈ ਨਵਾਂ ਵਰਜਨ ਉਪਲਬਧ ਹੁੰਦਾ ਹੈ। ਸਾਈਟ @@ -2413,7 +2411,6 @@ Windows ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ Parallels Desktop ਨੂੰ ਲਾਂਚ ਕਰੋ। ਕੁਝ ਵੈਬਸਾਈਟਾਂ ਤੇ ਆਪਣਾ ਡਾਟਾ ਪੜ੍ਹੋ ਇਸ ਫ਼ਾਈਲ ਵਿੱਚ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਹੈ -ਇੱਕੋ ਹੀ ਥਾਂ 'ਤੇ ਪਰਦੇਦਾਰੀ ਸੰਬੰਧੀ ਸਭ ਤੋਂ ਗੰਭੀਰ ਸੈਟਿੰਗਾਂ ਨੂੰ ਸਮਝੋ ਅਤੇ ਉਨ੍ਹਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ ਤੀਜੀ-ਧਿਰ ਦੀਆਂ ਸਾਰੀਆਂ ਕੁਕੀਜ਼ ਬਲਾਕ ਕਰੋ Google Chrome ਅਤੇ Chrome OS ਦੇ ਵਧੀਕ ਨਿਯਮ ਖਾਤਾ ਅੱਪਡੇਟ ਕਰੋ @@ -3344,6 +3341,7 @@ ਸੈਟਿੰਗਾਂ ਮੁੜ-ਬਹਾਲ ਕਰੋ , ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਦਲਣ ਲਈ ਤੁਹਾਡੀ ਲੋੜ ਹੈ। ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡਾ USB ਜਾਂ ਬਲੂਟੁੱਥ ਸਵਿੱਚ ਤੁਹਾਡੀ Chromebook ਨਾਲ ਕਨੈਕਟ ਹੈ। ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਕੁੰਜੀਆਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹੋ। +ਧੋਖਾਧੜੀ ਅਤੇ ਮਾਲਵੇਅਰ ਨੂੰ ਬਲਾਕ ਕਰਨ ਵਾਸਤੇ ਵਿਸਤ੍ਰਿਤ ਸੁਰੱਖਿਆ ਹੋਰ ਵੱਧ ਕੰਮ ਕਰਦੀ ਹੈ ਤਸਦੀਕੀ ਕੋਡ ਦੀ ਪੁਸ਼ਟੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ... ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਖਾਕਾ ਵੌਲਿਊਮ diff --git a/chrome/app/resources/generated_resources_pl.xtb b/chrome/app/resources/generated_resources_pl.xtb index 648871d7c89e2b..2ed1f876032444 100644 --- a/chrome/app/resources/generated_resources_pl.xtb +++ b/chrome/app/resources/generated_resources_pl.xtb @@ -1724,7 +1724,6 @@ Możesz zarządzać ustawieniami konta, korzystając z aplikacji Family Link na Nie później niż Debugowanie Zmiana ustawień ułatwień dostępu -Sprawdź moje ustawienia Obniżony OK Otwórz terminal odzyskiwania @@ -1853,7 +1852,6 @@ Możesz zarządzać ustawieniami konta, korzystając z aplikacji Family Link na Ustawianie zdjęcia profilowego Zrzut ekranu z widocznymi na nim teraz programami Sprawdzam źródła zasilania... -Sprawdzanie prywatności Otwórz jako przypiętą kartę To rozszerzenie jest nieaktualne i zostało wyłączone zgodnie z polityką firmy. Może zostać włączone automatycznie, gdy dostępna będzie nowa wersja. Witryna @@ -2401,7 +2399,6 @@ Domena wymaga, by karta inteligentna pozostała w gnieźdz Włącz aplikację Parallels Desktop, by zainstalować system Windows. Odczyt Twoich danych na kilku stronach internetowych Ten plik zawiera treści o charakterze kontrowersyjnym -Sprawdzaj najważniejsze ustawienia prywatności w 1 miejscu Blokuj wszystkie pliki cookie innych firm Dodatkowe warunki korzystania z Google Chrome i Chrome OS Aktualizuj konto @@ -3333,6 +3330,7 @@ Domena wymaga, by karta inteligentna pozostała w gnieźdz Przywróć ustawienia Twój administrator () prosi Cię o zmianę Twojego hasła. Aby rozpocząć, sprawdź, czy do Chromebooka został podłączony przełącznik USB lub Bluetooth. Możesz też użyć klawiatury. +Silniejsza ochrona lepiej chroni przed phishingiem i złośliwym oprogramowaniem Sprawdzam kod potwierdzenia... Układ klawiatury fizycznej Głośność diff --git a/chrome/app/resources/generated_resources_pt-BR.xtb b/chrome/app/resources/generated_resources_pt-BR.xtb index 919264fb5dbb96..143e46230b5c9c 100644 --- a/chrome/app/resources/generated_resources_pt-BR.xtb +++ b/chrome/app/resources/generated_resources_pt-BR.xtb @@ -1743,7 +1743,6 @@ e Ctrl + Alt + Diminuir brilho para diminuí-lo. Não depois Depurar Modificar suas configurações de acessibilidade -Revisar minhas configurações Baixo relevo Ok Abrir terminal de recuperação @@ -1872,7 +1871,6 @@ e Ctrl + Alt + Diminuir brilho para diminuí-lo. Definir a foto do seu perfil Captura de tela dos programas que estão em exibição Verificando fontes de energia… -Revisão de privacidade Abrir como guia fixada Esta extensão está desatualizada e desativada por uma política empresarial. Ela poderá ser ativada automaticamente quando uma versão recente estiver disponível. Site @@ -2421,7 +2419,6 @@ e Ctrl + Alt + Diminuir brilho para diminuí-lo. Inicie o Parallels Desktop para instalar o Windows. Leia seus dados em uma série de websites O arquivo tem conteúdo confidencial -Entenda e revise as configurações de privacidade mais importantes em um só lugar Bloquear todos os cookies de terceiros Termos adicionais do Google Chrome e do Chrome OS Atualizar conta @@ -3353,6 +3350,7 @@ e Ctrl + Alt + Diminuir brilho para diminuí-lo. Restaurar configurações , seu administrador solicita que você altere sua senha. Para começar, confira se o interruptor USB ou Bluetooth está conectado ao Chromebook. Também é possível usar as teclas do teclado. +A Proteção reforçada é mais eficiente no combate a golpes de phishing e malware Verificando código de confirmação… Layout do teclado físico Volume diff --git a/chrome/app/resources/generated_resources_pt-PT.xtb b/chrome/app/resources/generated_resources_pt-PT.xtb index 10faa272032aa1..941b5e3d61f362 100644 --- a/chrome/app/resources/generated_resources_pt-PT.xtb +++ b/chrome/app/resources/generated_resources_pt-PT.xtb @@ -1724,7 +1724,6 @@ e Ctrl + Alt + Diminuir o brilho para diminuir o zoom. Não posterior a Depurar Alterar as definições de acessibilidade -Analisar definições Reduzida OK Abrir terminal de recuperação @@ -1853,7 +1852,6 @@ e Ctrl + Alt + Diminuir o brilho para diminuir o zoom. Definir a sua imagem do perfil Captura de ecrã dos programas atualmente no ecrã A verificar as fontes alimentação… -Análise da privacidade Abrir como Separador Fixo Esta extensão está desatualizada e foi desativada por uma política empresarial; pode ser ativada automaticamente quando estiver disponível uma versão mais recente. Site @@ -2400,7 +2398,6 @@ Pretende pará-lo? Inicie o Parallels Desktop para instalar o Windows. Ler os seus dados em vários Sites Este ficheiro tem conteúdo sensível -Compreenda e analise as definições de privacidade mais críticas num único local Bloquear todos os cookies de terceiros Termos Adicionais do Google Chrome e do Chrome OS Atualizar conta @@ -3331,6 +3328,7 @@ Pretende pará-lo? Restaurar definições , o seu gestor requer que altere a sua palavra-passe. Para começar, certifique-se de que o comutador USB ou Bluetooth está ligado ao Chromebook. Também pode utilizar as teclas do teclado. +A proteção melhorada vai mais além para bloquear o phishing e o software malicioso. A validar o código de validação… Esquema de teclado físico Volume diff --git a/chrome/app/resources/generated_resources_ro.xtb b/chrome/app/resources/generated_resources_ro.xtb index 8cecbb2d833cdc..354fe4d4d3e30a 100644 --- a/chrome/app/resources/generated_resources_ro.xtb +++ b/chrome/app/resources/generated_resources_ro.xtb @@ -1724,7 +1724,6 @@ Poți gestiona setările contului dacă instalezi aplicația Family Link pe disp Nu după Remediați erorile Modifică setările de accesibilitate -Examinează setările Adâncită OK Deschide terminalul de recuperare @@ -1853,7 +1852,6 @@ Poți gestiona setările contului dacă instalezi aplicația Family Link pe disp Setează fotografia de profil Captură de ecran a programelor afișate pe ecran Se verifică sursele de alimentare… -Examinarea confidențialității Deschideți ca filă fixată Această extensie este învechită și a fost dezactivată de o politică de companie. Dacă este disponibilă o nouă versiune, extensia ar putea fi activată automat. Site @@ -2399,7 +2397,6 @@ Mesaj de la server: Lansează Parallels Desktop pentru a instala Windows. Citește datele de pe un număr de site-uri Acest fișier include conținut sensibil -Înțelege și examinează setările de confidențialitate esențiale într-un singur loc Blocați toate cookie-urile terță parte Condițiile suplimentare pentru Google Chrome și Sistemul de operare Chrome Actualizează contul @@ -3330,6 +3327,7 @@ Mesaj de la server: Restabilește setările , administratorul solicită să îți schimbi parola. Pentru început, asigură-te că USB-ul sau Bluetooth-ul este conectat la Chromebook. Poți folosi și tastele de pe tastatură. +Protecția îmbunătățită face mai multe pentru blocarea phishingului și a programelor malware Este verificat codul de confirmare... Aspectul tastaturii fizice Volum diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb index bed46422eab5b0..98d23f6637264c 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb @@ -1724,7 +1724,6 @@ Не позже Отладка Изменение настроек специальных возможностей -Проверить настройки Утопленная ОК Открыть терминал для восстановления @@ -1853,7 +1852,6 @@ Выберите фото профиля Скриншот с открытыми программами на экране Проверка источников питания… -Проверка конфиденциальности Открыть в закрепленной вкладке Это устаревшее расширение отключено в соответствии с корпоративной политикой. Когда появится новая версия, оно может включиться автоматически. Сайт @@ -2399,7 +2397,6 @@ Чтобы установить Windows, запустите Parallels Desktop. Просмотр данных на нескольких сайтах Этот файл содержит конфиденциальный контент. -Самые важные настройки конфиденциальности на одной странице. Заблокировать все сторонние файлы cookie Дополнительные условия использования Google Chrome и Chrome OS Обновить аккаунт @@ -3330,6 +3327,7 @@ Восстановить настройки , администратор просит вас сменить пароль. Чтобы начать работу, убедитесь, что к устройству Chromebook подключен переключатель USB или Bluetooth. Вы также можете использовать клавиши на клавиатуре. +В режиме "Улучшенная защита" фишинговые атаки и вредоносное ПО блокируются ещё эффективнее. Проверка кода подтверждения… Раскладка физической клавиатуры Объем diff --git a/chrome/app/resources/generated_resources_si.xtb b/chrome/app/resources/generated_resources_si.xtb index f2702e495f7449..8f06f0feca1d46 100644 --- a/chrome/app/resources/generated_resources_si.xtb +++ b/chrome/app/resources/generated_resources_si.xtb @@ -1730,7 +1730,6 @@ පසුව නොවේ නිදොස් කිරීම ඔබගේ ප්‍රවේශ්‍යතා සැකසුම් වෙනස් කරන්න -මගේ සැකසීම් සමාලෝචනය කරන්න අවපාත කළ හරි ප්‍රතිසාධන පර්යන්තය විවෘතයි @@ -1859,7 +1858,6 @@ ඔබගේ පැතිකඩ පින්තූරය සකසන්න දැනට තිරයේ ඇති වැඩසටහන්වල තිර රුව බල මූලාශ්‍ර පරීක්‍ෂා කෙරේ... -පෞද්ගලිකත්ව සමාලෝචනය ඇමිණූ ටැබයක් ලෙස විවෘත කරන්න මෙම දිගුව පැරණි හා ව්‍යවසාය ප්‍රතිපත්තිය මගින් අක්‍රීය කර ඇත. එය නව සංස්කරණයක් පවතින විට නැවත සක්‍රීය වනු ඇත. අඩවිය @@ -2407,7 +2405,6 @@ Windows ස්ථාපනය කිරීමට කරුණාකර Parallels Desktop දියත් කරන්න. වෙබ අඩවි විශාල ගණනක ඔබගේ දත්ත කියවන්න මෙම ගොනුවේ සංවේදී අන්තර්ගතය ඇත -එක් ස්ථානයක් තුළදී ඉතාම තීරණාත්මක පෞද්ගලිකත්ව සැකසීම් වටහා ගන්න සහ සමාලෝචනය කරන්න සියලු තෙවන පාර්ශ්ව කුකි අවහිර කරන්න Google Chrome සහ Chrome OS අතිරේක නියම ගිණුම යාවත්කාලීන කරන්න @@ -3340,6 +3337,7 @@ Linux ස්ථාපනය කිරීම දත්තවලින් සැකසීම් ප්‍රතිසාධනය කරන්න , ඔබේ පරිපාලකට ඔබ ඔබේ මුරපදය වෙනස් කිරීමට අවශ්‍යයි. ආරම්භ කිරීමට, කරුණාකර ඔබගේ USB හෝ බ්ලූටූත් ස්විචය ඔබගේ Chromebook වෙත සම්බන්ධ වී ඇති බවට සහතික කර ගන්න. ඔබට යතුරු පුවරු යතුරුද භාවිත කළ හැකිය. +තතුබෑම් සහ අනිෂ්ට මෘදුකාංග අවහිර කිරීමට වැඩි දියුණු කළ ආරක්ෂාව වැඩි දෙයක් කරයි තහවුරු කිරීමේ කේතය සත්‍යාපනය කරමින්... භෞතික යතුරු පුවරු පිරිසැලසුම ශබ්ද තීව්‍රතාවය diff --git a/chrome/app/resources/generated_resources_sk.xtb b/chrome/app/resources/generated_resources_sk.xtb index 9d22d9159f20d2..b187aeca3cfb69 100644 --- a/chrome/app/resources/generated_resources_sk.xtb +++ b/chrome/app/resources/generated_resources_sk.xtb @@ -1729,7 +1729,6 @@ stlačením klávesov Ctrl + Alt + zníženie jasu zobrazenie oddialite.Nie po Ladiť Zmeniť nastavenia dostupnosti -Skontrolovať nastavenia Rytina OK Otvoriť terminál obnovenia @@ -1858,7 +1857,6 @@ stlačením klávesov Ctrl + Alt + zníženie jasu zobrazenie oddialite.Nastavte si profilovú fotku Snímky programov, ktoré sú momentálne na obrazovke Kontrolujú sa zdroje napájania… -Kontrola ochrany súkromia Otvoriť ako pevnú kartu Toto rozšírenie je zastarané a je zakázané podnikovým pravidlom. Možno bude opäť automaticky povolené, keď bude k dispozícii novšia verzia. Web @@ -2406,7 +2404,6 @@ stlačením klávesov Ctrl + Alt + zníženie jasu zobrazenie oddialite.Spustite Parallels Desktop a nainštalujte tak Windows. Čítať vaše údaje na viacerých webových stránkach Tento súbor má citlivý obsah -Porozumejte najdôležitejším nastaveniam ochrany súkromia a skontrolujte ich na jednom mieste Blokovať všetky súbory cookie tretích strán Doplňujúce zmluvné podmienky prehliadača Google Chrome a systému Chrome OS Aktualizovať účet @@ -3338,6 +3335,7 @@ stlačením klávesov Ctrl + Alt + zníženie jasu zobrazenie oddialite.Obnoviť nastavenia , váš správca vyžaduje zmenu hesla. Ak chcete začať, skontrolujte, či je k Chromebooku pripojený prepínač USB alebo Bluetooth. Môžete tiež použiť klávesy na klávesnici. +Rozšírená ochrana efektívnejšie blokuje phishing aj malvér Overuje sa potvrdzovací kód… Rozloženie fyzickej klávesnice Hlasitosť diff --git a/chrome/app/resources/generated_resources_sl.xtb b/chrome/app/resources/generated_resources_sl.xtb index f1d9729c367bdd..27103dca63f022 100644 --- a/chrome/app/resources/generated_resources_sl.xtb +++ b/chrome/app/resources/generated_resources_sl.xtb @@ -1741,7 +1741,6 @@ in Ctrl +Alt + tipko za zmanjšanje svetlosti za pomanjšavo. Ne po Odpravljanje napak Sprememba nastavitev funkcij za ljudi s posebnimi potrebami -Pregled nastavitev Znižano V redu Odpri terminal za obnovitev @@ -1870,7 +1869,6 @@ in Ctrl +Alt + tipko za zmanjšanje svetlosti za pomanjšavo. Nastavitev slike za profil Posnetek zaslona s programi, ki so trenutno na zaslon Preverjanje virov napajanja ... -Pregled zasebnosti Odpri v pripetem zavihku Ta razširitev je zastarela in jo je onemogočil pravilnik podjetja. Ko bo na voljo novejša različica, bo morda samodejno omogočena. Spletno mesto @@ -2416,7 +2414,6 @@ Domena zahteva, da je pametna kartica vstavljena.Zaženite program Parallels Desktop, če želite namestiti sistem Windows. Branje vaših podatkov na več spletnih mestih V tej datoteki je občutljiva vsebina -Razlaga in pregled bistvenih nastavitev zasebnosti na enem mestu. Blokiraj vse piškotke drugih spletnih mest Dodatni pogoji za Google Chrome in Chrome OS Posodobi račun @@ -3347,6 +3344,7 @@ Domena zahteva, da je pametna kartica vstavljena.Obnovi nastavitve , skrbnik zahteva, da spremenite geslo. Če želite začeti, mora biti stikalo USB ali Bluetooth povezano s Chromebookom. Uporabljate lahko tudi tipke na tipkovnici. +Izboljšana zaščita učinkoviteje blokira lažno predstavljanje in zlonamerno programsko opremo. Preverjanje potrditvene kode … Postavitev fizične tipkovnice Glasnost diff --git a/chrome/app/resources/generated_resources_sq.xtb b/chrome/app/resources/generated_resources_sq.xtb index 867dc29db69f86..76dc28b12d5997 100644 --- a/chrome/app/resources/generated_resources_sq.xtb +++ b/chrome/app/resources/generated_resources_sq.xtb @@ -1720,7 +1720,6 @@ Për ndihmë lidhur me zgjidhjen e problemeve të transmetimit, drejtohu te Jo pas Korrigjo Ndrysho cilësimet e qasjes -Shqyrto cilësimet e mia I ulur Në rregull Hap terminalin e rikuperimit @@ -1849,7 +1848,6 @@ Për ndihmë lidhur me zgjidhjen e problemeve të transmetimit, drejtohu te Vendos fotografinë e profilit Pamjet e ekranit të programeve që janë aktualisht në ekran Po kontrollon burimet e energjisë... -Shqyrtimi i privatësisë Hape si skedë të gozhduar Kjo shtesë është e vjetruar dhe e çaktivizuar nga politika e ndërmarrjes. Ajo mund të aktivizohet automatikisht kur ofrohet një version më i ri. Sajti @@ -2395,7 +2393,6 @@ Për ndihmë lidhur me zgjidhjen e problemeve të transmetimit, drejtohu te Hap Parallels Desktop për të instaluar Windows. Lexo të dhënat e tua në një numër sajtesh uebi Ky skedar ka përmbajtje delikate -Mëso dhe shqyrto cilësimet më të rëndësishme të privatësisë në një vend Blloko të gjitha kukit e palëve të treta Kushtet shtesë të Google Chrome dhe sistemit operativ Chrome Përditëso llogarinë @@ -3326,6 +3323,7 @@ Për ndihmë lidhur me zgjidhjen e problemeve të transmetimit, drejtohu te Restauro cilësimet , administratori të kërkon që të ndryshosh fjalëkalimin. Për të filluar, sigurohu që çelësi me USB ose me Bluetooth të jetë i lidhur me Chromebook. Mund të përdorësh edhe tastet e tastierës. +Mbrojtja e përmirësuar bën edhe më shumë për bllokimin e mashtrimeve dhe softuerëve keqdashës Po verifikon kodin e konfirmimit... Struktura e tastierës fizike Volumi diff --git a/chrome/app/resources/generated_resources_sr-Latn.xtb b/chrome/app/resources/generated_resources_sr-Latn.xtb index ffe389842f44af..b77e695a035ac1 100644 --- a/chrome/app/resources/generated_resources_sr-Latn.xtb +++ b/chrome/app/resources/generated_resources_sr-Latn.xtb @@ -1722,7 +1722,6 @@ a Ctrl+Alt+taster za smanjivanje osvetljenosti da biste umanjili prikaz.Ne posle Otkloni greške Menjanje podešavanja pristupačnosti -Prikaži moja podešavanja Udubljeno Potvrdi Otvori terminal za oporavak @@ -1851,7 +1850,6 @@ a Ctrl+Alt+taster za smanjivanje osvetljenosti da biste umanjili prikaz.Podesite sliku profila Snimak ekrana programa koji su trenutno na ekranu Proveravaju se izvori napajanja... -Pregled privatnosti Otvori kao zakačenu karticu Ovaj dodatak je zastareo i smernice za preduzeća ga onemogućavaju. Možda će automatski postati omogućen kada novija verzija postane dostupna. Sajt @@ -2397,7 +2395,6 @@ a Ctrl+Alt+taster za smanjivanje osvetljenosti da biste umanjili prikaz.Pokrenite Parallels Desktop da biste instalirali Windows. Čitanje vaših podataka na više veb-sajtova Ova datoteka sadrži osetljiv sadržaj -Razumite i pregledajte najvažnija podešavanja privatnosti na jednom mestu Blokiraj sve kolačiće trećih strana Dodatni uslovi za Google Chrome i Chrome OS Ažuriraj nalog @@ -3328,6 +3325,7 @@ a Ctrl+Alt+taster za smanjivanje osvetljenosti da biste umanjili prikaz.Vrati podešavanja , administrator zahteva da promenite lozinku. Da biste započeli, proverite da li je USB ili Bluetooth prekidač povezan na Chromebook. Možete da koristite i tastere na tastaturi. +Poboljšana zaštita nudi više mogućnosti za blokiranje „pecanja“ i malvera Verifikuje se kôd za potvrdu… Raspored tastera na fizičkoj tastaturi Jačina zvuka diff --git a/chrome/app/resources/generated_resources_sr.xtb b/chrome/app/resources/generated_resources_sr.xtb index aaf95fec1cc3c1..67bfc9af6bd638 100644 --- a/chrome/app/resources/generated_resources_sr.xtb +++ b/chrome/app/resources/generated_resources_sr.xtb @@ -1722,7 +1722,6 @@ Не после Отклони грешке Мењање подешавања приступачности -Прикажи моја подешавања Удубљено Потврди Отвори терминал за опоравак @@ -1851,7 +1850,6 @@ Подесите слику профила Снимак екрана програма који су тренутно на екрану Проверавају се извори напајања... -Преглед приватности Отвори као закачену картицу Овај додатак је застарео и смернице за предузећа га онемогућавају. Можда ће аутоматски постати омогућен када новија верзија постане доступна. Сајт @@ -2397,7 +2395,6 @@ Покрените Parallels Desktop да бисте инсталирали Windows. Читање ваших података на више веб-сајтова Ова датотека садржи осетљив садржај -Разумите и прегледајте најважнија подешавања приватности на једном месту Блокирај све колачиће трећих страна Додатни услови за Google Chrome и Chrome ОС Ажурирај налог @@ -3328,6 +3325,7 @@ Врати подешавања , администратор захтева да промените лозинку. Да бисте започели, проверите да ли је USB или Bluetooth прекидач повезан на Chromebook. Можете да користите и тастере на тастатури. +Побољшана заштита нуди више могућности за блокирање „пецања“ и малвера Верификује се кôд за потврду… Распоред тастера на физичкој тастатури Јачина звука diff --git a/chrome/app/resources/generated_resources_sv.xtb b/chrome/app/resources/generated_resources_sv.xtb index 73281980f7ccd0..8df588f044d770 100644 --- a/chrome/app/resources/generated_resources_sv.xtb +++ b/chrome/app/resources/generated_resources_sv.xtb @@ -1738,7 +1738,6 @@ och Ctrl + Alt + Minska ljusstyrka för att zooma ut. Inte efter Felsökning Ändra tillgänglighetsinställningarna -Granska mina inställningar Nedsänkt OK Öppna återställningsterminalen @@ -1867,7 +1866,6 @@ och Ctrl + Alt + Minska ljusstyrka för att zooma ut. Ange profilbild Skärmbild av program som visas på skärmen Kontrollerar strömkällor … -Granskning av integritet Öppna som en fast flik Tillägget är inaktuellt och inaktiverat av företagspolicyn. Det kan aktiveras automatiskt när en ny version blir tillgänglig. Webbplats @@ -2413,7 +2411,6 @@ och Ctrl + Alt + Minska ljusstyrka för att zooma ut. Starta Parallels Desktop om du vill installera Windows. Läsa din data på ett antal webbplatser Filen har känsligt innehåll -Förstå och granska de viktigaste integritetsinställningarna från ett ställe Blockera alla cookies från tredje part Ytterligare villkor för Google Chrome och Chrome OS Uppdatera kontot @@ -3344,6 +3341,7 @@ och Ctrl + Alt + Minska ljusstyrka för att zooma ut. Återställ inställningar , administratören kräver att du ändrar ditt lösenord. Kontrollera att USB- eller Bluetooth-brytaren är ansluten till Chromebook innan du sätter igång. Du kan även använda tangenter på tangentbordet. +Förbättrat skydd är bättre på att blockera nätfiske och skadlig programvara Bekräftelsekoden verifieras … Layout på fysiskt tangentbord Volym diff --git a/chrome/app/resources/generated_resources_sw.xtb b/chrome/app/resources/generated_resources_sw.xtb index a4b89d40e2fe93..bc7cbe4373f6dc 100644 --- a/chrome/app/resources/generated_resources_sw.xtb +++ b/chrome/app/resources/generated_resources_sw.xtb @@ -1734,7 +1734,6 @@ na vitufe vya Ctrl, Alt pamoja na kitufe cha kupunguza Mwangaza ili usogeze mbal Sio Baadaye Tatua Badilisha mipangilio yako ya ufikiaji -Kagua mipangilio yangu Imepunguzwa Sawa Fungua kituo cha kurejesha @@ -1863,7 +1862,6 @@ na vitufe vya Ctrl, Alt pamoja na kitufe cha kupunguza Mwangaza ili usogeze mbal Weka picha yako ya wasifu Picha ya skrini ya programu ambazo zipo kwenye skrini yako kwa sasa. Inakagua vyanzo vya nishati... -Ukaguzi wa faragha Fungua kama Kichupo Kilichobanwa Kiendelezi hiki kimekwisha muda na kuzimwa na sera ya biashara. Kinaweza kuwashwa kiotomatiki toleo jipya zaidi likipatikana. Tovuti @@ -2409,7 +2407,6 @@ na vitufe vya Ctrl, Alt pamoja na kitufe cha kupunguza Mwangaza ili usogeze mbal Tafadhali fungua programu ya Parallels Desktop ili usakinishe Windows. Soma data yako kwenye tovuti kadhaa Faili hii ina maudhui nyeti -Elewa na ukague mipangilio muhimu zaidi ya faragha katika sehemu moja Zuia vidakuzi vyote vya wengine Sheria na Masharti ya Ziada ya Google Chrome na Mfumo wa Uendeshaji wa Chrome Sasisha akaunti @@ -3338,6 +3335,7 @@ Ungependa kuanza ? Rejesha Mipangilio , msimamizi wako anakuhitaji ubadilishe nenosiri lako. Ili uanze, tafadhali hakikisha kwamba swichi yako ya USB au Bluetooth imeunganishwa kwenye Chromebook yako. Unaweza pia kutumia vitufe vya kibodi. +Kipengele cha ulinzi wa hali ya juu hufanya mengi zaidi ili kuzuia programu hasidi na wizi wa data binafsi Inahakikisha nambari ya kuthibitisha... Mpangilio wa kibodi halisi Kiwango cha sauti diff --git a/chrome/app/resources/generated_resources_ta.xtb b/chrome/app/resources/generated_resources_ta.xtb index a821735c042b9f..aa6a082843fa19 100644 --- a/chrome/app/resources/generated_resources_ta.xtb +++ b/chrome/app/resources/generated_resources_ta.xtb @@ -1738,7 +1738,6 @@ இதன்பிறகு அல்ல பிழைத்திருத்து உங்கள் அணுகல்தன்மை அமைப்புகளை மாற்றலாம் -எனது அமைப்புகளைக் காட்டு டிப்ரஸ்டு சரி மீட்பு டெர்மினலைத் திற @@ -1867,7 +1866,6 @@ சுயவிவரப் படத்தை அமைக்கவும் தற்சமயம் திரையிலுள்ள நிரல்களின் ஸ்கிரீன்ஷாட் பவர் மூலங்களை சரிபார்க்கிறது... -தனியுரிமை அமைப்புகளைச் சரிபாருங்கள் பொருத்திய தாவலாகத் திற இந்த நீட்டிப்பு காலாவதியானது, நிறுவனக் கொள்கையால் முடக்கப்பட்டுள்ளது. புதிய பதிப்புக் கிடைக்கும் போது தானாகவே இயக்கப்பட வாய்ப்புள்ளது. தளம் @@ -2413,7 +2411,6 @@ Windowsஸை நிறுவ, Parallels Desktopபைத் துவக்கவும். பல இணையதளங்களில் உங்கள் தரவைப் படித்தல் இந்த ஃபைல் பாதுகாக்கவேண்டிய உள்ளடக்கத்தைக் கொண்டுள்ளது -மிக முக்கியமான தனியுரிமை அமைப்புகளை ஒரே இடத்தில் இருந்தே பார்க்கலாம் மாற்றலாம் மூன்றாம் தரப்பு குக்கீகள் அனைத்தையும் தடு Google Chrome & Chrome OSஸின் கூடுதல் விதிமுறைகள் கணக்கைப் புதுப்பி @@ -3344,6 +3341,7 @@ அமைப்புகளை மீட்டெடு , உங்கள் கடவுச்சொல்லை மாற்றும்படி நிர்வாகி கோருகிறார். இதைப் பயன்படுத்தத் தொடங்க, USB/புளூடூத் சுவிட்ச் உங்கள் Chromebookகுடன் இணைக்கப்பட்டிருப்பதை உறுதிப்படுத்திக்கொள்ளவும். கீபோர்டு விசைகளையும் பயன்படுத்தலாம். +ஃபிஷிங்கையும் மால்வேரையும் தடுக்க மேம்பட்ட பாதுகாப்பு உதவுகிறது உறுதிப்படுத்தல் குறியீட்டைச் சரிபார்க்கிறது... உங்கள் கீபோர்டின் தளவமைப்பு அளவு diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb index 5dcb56632f32c9..e152d20569ac7b 100644 --- a/chrome/app/resources/generated_resources_te.xtb +++ b/chrome/app/resources/generated_resources_te.xtb @@ -1737,7 +1737,6 @@ తరువాత కాదు డీబగ్ మీ యాక్సెస్‌ సెట్టింగ్‌లను మార్చడం -నా సెట్టింగ్‌ల రివ్యూ కిందికి ఉన్నట్లుగా సరే రికవరీ టెర్మినల్‌ను తెరువు @@ -1866,7 +1865,6 @@ మీ ప్రొఫైల్ చిత్రాన్ని సెట్ చేయండి ప్రస్తుతం స్క్రీన్‌పై ఉన్న ప్రోగ్రామ్‌ల స్క్రీన్‌షాట్ పవర్ మూలాలను తనిఖీ చేస్తోంది... -గోప్యతా రివ్యూ పిన్ చేసిన ట్యాబ్ లాగా తెరువు ఈ ఎక్స్‌టెన్షన్ చాలా పాతది, బిజినెస్ విధానం కారణంగా నిలిపివేయబడింది. అయితే, కొత్త వెర్షన్ అందుబాటులో ఉన్నప్పుడు ఇది ఆటోమేటిక్‌గా ప్రారంభించబడవచ్చు. సైట్ @@ -2412,7 +2410,6 @@ Windowsను ఇన్‌స్టాల్ చేయడానికి, దయచేసి parallels desktopను ప్రారంభించండి. అనేక వెబ్‌సైట్‌ల్లోని మీ డేటాను చదవండి ఈ ఫైల్‌లో గోప్యమైన కంటెంట్ ఉంది -అత్యంత ముఖ్యమైన గోప్యతా సెట్టింగ్‌లను ఒకే చోట అర్ధం చేసుకుని రివ్యూ చేయండి అన్ని మూడవ-పార్టీ కుక్కీలను బ్లాక్ చేయి Google Chrome, Chrome OS అదనపు నిబంధనలు ఖాతాను అప్‌డేట్ చేయి @@ -3343,6 +3340,7 @@ సెట్టింగ్‌లను పునరుద్ధరించు , మీ నిర్వాహకులకు మీరు మీ పాస్‌వర్డ్‌ను మార్చడం అవసరం. ప్రారంభించడానికి, మీ USB లేదా బ్లూటూత్ స్విచ్ మీ Chromebookకి కనెక్ట్ చేసి ఉందని నిర్ధారించుకోండి. మీరు కీబోర్డ్ కీలను కూడా ఉపయోగించవచ్చు. +ఫిషింగ్, అలాగే మాల్‌వేర్‌ను బ్లాక్ చేయడానికి మెరుగుపరచిన రక్షణ మరింత చేయగలదు నిర్ధారణ కోడ్‌ను వెరిఫై చేస్తోంది... భౌతిక కీబోర్డ్ లేఅవుట్ వాల్యూమ్ diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb index adab503c5e917c..879a6de2246040 100644 --- a/chrome/app/resources/generated_resources_th.xtb +++ b/chrome/app/resources/generated_resources_th.xtb @@ -250,6 +250,7 @@ กำลังดำเนินการคืนค่า Linux ข้อผิดพลาดของส่วนขยาย ไม่สามารถติดตั้ง : URL ของรูปภาพแสดงรหัสข้อผิดพลาด โปรดติดต่อผู้ดูแลระบบ +อุปกรณ์ที่ จาก , แท็บเล็ตชื่อ เครื่องหมายวงเล็บปีกกาเปิดที่ต้องมี: การดำเนินการนี้จะล้างข้อมูลที่เว็บไซต์และแอปต่างๆ จัดเก็บไว้รวมทั้งสิ้น กำลังสแกนหาเครือข่ายอินเทอร์เน็ตมือถือ... @@ -436,6 +437,7 @@ เลือกไว้ รายการ ตั้งค่าตั๋ว Kerberos ที่ใช้งานอยู่ ซึ่งเป็นเจ้าของอุปกรณ์เป็นผู้จัดการการตั้งค่านี้ +อุปกรณ์ที่ จาก , โทรศัพท์ชื่อ ไม่สามารถโหลดธีมจาก "" กด "" อีกครั้งเพื่อยืนยันการกำหนดและ หน้าเว็บ ไฟล์เดียว @@ -859,6 +861,7 @@ กล้องเปิดอยู่ เพิ่มตำแหน่ง... เชื่อถือใบรับรองนี้ในการระบุตัวตนผู้ผลิตซอฟต์แวร์ +อุปกรณ์ที่ จาก , อุปกรณ์ที่ไม่รู้จักชื่อ โฟลเดอร์นี้ว่างเปล่า คุณได้ติดตั้ง VPN, พร็อกซี, ไฟร์วอลล์ หรือซอฟต์แวร์ NAS พิเศษไว้ไหม ไม่พบพอร์ตอนุกรม @@ -1232,6 +1235,7 @@ ข้อมูลไฟล์ รับคำอธิบายรูปภาพจาก Google ไหม อุปกรณ์นี้จัดการโดยองค์กรของคุณ +อุปกรณ์ที่ จาก , อุปกรณ์ควบคุมเกมชื่อ เปิดเป็นหน้าต่างแท็บ เช่น 1-5, 8, 11-13 เปิดด้วยเครื่องมือดูระบบ @@ -1722,7 +1726,6 @@ ไม่เกิน แก้ปัญหา เปลี่ยนแปลงการตั้งค่าการเข้าถึง -ตรวจสอบการตั้งค่าของฉัน ลดต่ำ ตกลง เปิดเทอร์มินัลการกู้คืน @@ -1851,7 +1854,6 @@ ตั้งรูปโปรไฟล์ ภาพหน้าจอของโปรแกรมที่กำลังแสดงอยู่ในหน้าจอ กำลังตรวจสอบแหล่งจ่ายไฟ... -ตรวจสอบความเป็นส่วนตัว เปิดเป็นแท็บที่ถูกตรึง ส่วนขยายนี้ล้าสมัยแล้วและปิดใช้อยู่โดยนโยบายองค์กร แต่อาจเปิดใช้โดยอัตโนมัติได้เมื่อมีเวอร์ชันใหม่ เว็บไซต์ @@ -1992,6 +1994,7 @@ ทำซ้ำแท็บ เรียกใช้เครื่องมือ ตัวแก้ไข และ IDE ของ Linux ใน ดูข้อมูลเพิ่มเติม รีเซ็ตสิทธิ์ +อุปกรณ์ที่ จาก , อุปกรณ์เสียงชื่อ {NUM_DAYS,plural, =1{ กำหนดให้คุณเชื่อมต่อ Wi-Fi วันนี้เพื่อดาวน์โหลดอัปเดต หรือดาวน์โหลดจากการเชื่อมต่อที่มีการวัดปริมาณอินเทอร์เน็ต (อาจมีค่าบริการ)}other{ กำหนดให้คุณเชื่อมต่อ Wi-Fi และดาวน์โหลดอัปเดตก่อนเวลาที่กำหนด หรือดาวน์โหลดจากการเชื่อมต่อที่มีการวัดปริมาณอินเทอร์เน็ต (อาจมีค่าบริการ)}} คุณแน่ใจหรือไม่ว่าต้องการยกเลิกขั้นตอนการตั้งค่าบริการข้อมูลโทรศัพท์มือถือ ฐานข้อมูลที่มีการจัดทำดัชนี @@ -2297,6 +2300,7 @@ พบอุปกรณ์แบบถอดออกได้ มีการแนะนำอีโมจิ กดขึ้นหรือลงเพื่อไปยังอีโมจิที่ต้องการแล้วกด Enter เพื่อแทรก หน่วยความจำที่ใช้ +จับคู่กับอุปกรณ์ ไม่ได้ เลือกอุปกรณ์เพื่อลองอีกครั้ง ข้อผิดพลาดในการเชื่อมต่อ เสร็จสมบูรณ์ ข้อจำกัดนโยบายใบรับรอง @@ -2397,7 +2401,6 @@ โปรดเปิด Parallels Desktop เพื่อติดตั้ง Windows อ่านข้อมูลบนเว็บไซต์จำนวนมาก ไฟล์นี้มีเนื้อหาที่ละเอียดอ่อน -ทำความเข้าใจและตรวจสอบการตั้งค่าความเป็นส่วนตัวที่สำคัญที่สุดในที่เดียว ปิดกั้นคุกกี้ของบุคคลที่สามทั้งหมด ข้อกำหนดเพิ่มเติมของ Google Chrome และ Chrome OS อัปเดตบัญชี @@ -3128,6 +3131,7 @@ คำที่กำหนดเอง แ&ท็บใหม่ คุณเลือกสิ่งที่ต้องการซิงค์ได้เสมอในการตั้งค่า +เมื่อเปิดใช้ Google Safe Browsing เวอร์ชันปรับปรุง คุณจะได้รับการรักษาความปลอดภัยที่เข้มงวดที่สุดของ Chrome ปิดโปรแกรมรักษาหน้าจอ มนุษย์ต่างดาว รายงานความคิดเห็น @@ -3328,6 +3332,7 @@ กู้คืนการตั้งค่า ผู้ดูแลระบบต้องการให้คุณเปลี่ยนรหัสผ่าน ในการเริ่มต้นใช้งาน โปรดตรวจสอบว่า USB หรือสวิตช์บลูทูธเชื่อมต่ออยู่กับ Chromebook คุณจะใช้ปุ่มบนแป้นพิมพ์แทนก็ได้ +การปกป้องที่ปรับปรุงแล้วทำได้มากกว่าบล็อกฟิชชิงและมัลแวร์ กำลังตรวจสอบรหัสยืนยัน... รูปแบบแป้นพิมพ์จริง ระดับเสียง @@ -3632,6 +3637,7 @@ ดาวน์โหลด ใช้ไมโครโฟนของคุณ พื้นที่ดิสก์ของอุปกรณ์ใกล้จะเต็มแล้ว +อุปกรณ์ที่ จาก , คอมพิวเตอร์ชื่อ มีการวางคุกกี้ต่อไปนี้เมื่อคุณดูหน้าเว็บนี้ อนุญาตให้ Android Messages นำส่งข้อความจากโทรศัพท์ไปยัง Chromebook ของคุณ คุณมีใบรับรองจากองค์กรเหล่านี้ซึ่งระบุถึงตัวคุณ @@ -3813,6 +3819,7 @@ "" ต้องการเชื่อมต่อกับพอร์ตอนุกรม บริการการตรวจสอบสิทธิ์นี้โฮสต์โดย หากต้องการตั้งค่าลายนิ้วมือ ให้บุตรหลานแตะปุ่มเปิด/ปิด ข้อมูลลายนิ้วมือของบุตรหลานจะจัดเก็บไว้อย่างปลอดภัยและอยู่ใน นี้เสมอ +คุณกำลังได้รับการปกป้องแบบมาตรฐาน {COUNT,plural, =1{1 ไฟล์}other{# ไฟล์}} การทำงาน รูปโปรไฟล์เริ่มต้นสีส้ม @@ -4396,6 +4403,7 @@ เกิดปัญหาเกี่ยวกับคำขอลงทะเบียนสาธิต การรีเซ็ตอุปกรณ์ของคุณจะไม่ส่งผลต่อบัญชี Google ของคุณหรือข้อมูลใดๆ ที่ซิงค์กับบัญชีเหล่านี้ อย่างไรก็ตาม ไฟล์ทั้งหมดที่บันทึกอยู่ภายในอุปกรณ์จะถูกลบ ลงชื่อเข้าใช้อัตโนมัติ +การแปลเป็นภาษาเสร็จสมบูรณ์ การตรวจสอบโปรแกรมควบคุมฮาร์ดแวร์ของ Microsoft Windows นำอุปกรณ์เข้าร่วมโดเมนไม่ได้ โปรดลองอีกครั้งหรือติดต่อเจ้าของอุปกรณ์หรือผู้ดูแลระบบ รหัสข้อผิดพลาด: เมนูหลัก @@ -5809,6 +5817,7 @@ {NUM_MINS,plural, =1{เรียกใช้การตรวจสอบความปลอดภัยเมื่อ 1 นาทีที่ผ่านมา}other{เรียกใช้การตรวจสอบความปลอดภัยเมื่อ {NUM_MINS} นาทีที่ผ่านมา}} รับข้อมูลแอปไม่สำเร็จ ยังพยายามเรียกใช้แอปอยู่... เครือข่ายที่ซ่อนอยู่ +อุปกรณ์ที่ จาก , เมาส์ชื่อ ตั้งค่าเป็นเรียกใช้อัตโนมัติ อนุญาตให้เว็บไซต์ที่ปิดล่าสุดดำเนินการส่งและรับข้อมูลต่อจนเสร็จ (แนะนำ) กำลังประมวลผลทางลัด... @@ -5972,6 +5981,7 @@ เครือข่าย Wi-Fi บริการการพิมพ์ อ่านข้อมูลที่คุณคัดลอกและวาง +อุปกรณ์ที่ จาก , กล้องวิดีโอชื่อ Transformations แอปพลิเคชันไม่ตอบสนอง เลือก "บังคับปิด" เพื่อปิดแอป บริการลงชื่อเข้าใช้นี้โฮสต์โดย @@ -6766,6 +6776,7 @@ อ่านข้อความทั้งหมดที่พูดโดยใช้เสียงสังเคราะห์ ขอ (ค่าเริ่มต้น) ไฟล์ +อุปกรณ์ที่ จาก , แป้นพิมพ์ชื่อ ส่งความคิดเห็น ความทึบแสงของข้อความ ไม่ตอบสนอง @@ -6789,6 +6800,7 @@ โปรดป้อนที่อยู่อีเมลที่ถูกต้อง พร้อมใช้งานสำหรับเว็บไซต์วิดีโอบางเว็บไซต์ เชื่อมต่อแป้นพิมพ์ USB แล้ว +การค้นหาในแผงด้านข้าง ปีที่หมดอายุ กระตุก &ตรวจสอบอุปกรณ์ @@ -6904,6 +6916,7 @@ ซิงค์บุ๊กมาร์ก รหัสผ่าน ประวัติการเข้าชม และอื่นๆ ในอุปกรณ์ทุกเครื่องแล้ว เนื้อหา {NUM_TABS,plural, =1{เพิ่มแท็บไปยังเรื่องรออ่าน}other{เพิ่มหลายแท็บไปยังเรื่องรออ่าน}} +เปิดอีกครั้ง ซ่อนการ์ดทั้งหมด ข้อมูลอุปกรณ์ สำรองข้อมูลไปยัง Google ไดรฟ์ กู้ข้อมูลคืนหรือเปลี่ยนอุปกรณ์ได้ง่ายๆ ทุกเมื่อ ข้อมูลสำรองนี้จะรวมถึงข้อมูลแอป ระบบจะอัปโหลดข้อมูลสำรองไปยัง Google และเข้ารหัสโดยใช้รหัสผ่านบัญชี Google ของบุตรหลาน ดูข้อมูลเพิ่มเติม @@ -6977,6 +6990,7 @@ ส่งไปยังอุปกรณ์ เสนอให้แปลหน้าที่ไม่ได้อยู่ในภาษาที่คุณอ่านได้ รีเฟรชเลย +กำลังจับคู่กับ รูปภาพขนาดย่อถูกลบแล้ว แสดง URL แบบเต็มเสมอ กำลังอัปโหลด... @@ -7214,9 +7228,11 @@ เพิ่มภาษา กำลังลงชื่อเข้าใช้ การเชื่อมต่ออินเทอร์เน็ตผ่านมือถือแบบด่วนล้มเหลว +Google Safe Browsing เวอร์ชันปรับปรุงปิดอยู่ อ๊ะ! เกิดข้อผิดพลาดขณะพยายามเข้าร่วมโดเมน โปรดลองอีกครั้ง URL การต่ออายุใบรับรองของ Netscape ส่งเสียงเมื่อกดปุ่ม +เปิดอีกครั้ง ไม่มี (HttpOnly) อัปเกรด ป้อน URL ที่มีรูปแบบที่ถูกต้อง diff --git a/chrome/app/resources/generated_resources_tr.xtb b/chrome/app/resources/generated_resources_tr.xtb index 4b44444fe855d5..013db1724d733b 100644 --- a/chrome/app/resources/generated_resources_tr.xtb +++ b/chrome/app/resources/generated_resources_tr.xtb @@ -1721,7 +1721,6 @@ Cihazınızda Family Link uygulamasını yükleyerek bu hesabın ayarlarını y Şundan Sonra Değil: Hata ayıkla Erişilebilirlik ayarlarını değiştirme -Ayarlarımı incele Bastırılmış Tamam Kurtarma terminalini aç @@ -1850,7 +1849,6 @@ Cihazınızda Family Link uygulamasını yükleyerek bu hesabın ayarlarını y Profil resminizi ayarlama Şu anda ekrandaki programların ekran görüntüsü Güç kaynakları kontrol ediliyor... -Gizlilik incelemesi İğnelenmiş Sekme Olarak Aç Bu uzantı, eski ve kurumsal politika tarafından devre dışı bırakıldı. Yeni bir sürüm kullanılabilir durumda olduğunda otomatik olarak etkin hale gelebilir. Site @@ -2396,7 +2394,6 @@ Sunucunun mesajı: Windows'u yüklemek için Parallels Desktop'u başlatın. Birden fazla web sitesindeki verilerinize erişme Bu dosya hassas içeriğe sahip -En kritik gizlilik ayarlarını anlayıp tek bir yerden inceleyin Tüm üçüncü taraf çerezlerini engelle Google Chrome ve Chrome OS Ek Şartları Hesabı güncelle @@ -3327,6 +3324,7 @@ Sunucunun mesajı: Ayarları Geri Yükle , yöneticiniz şifrenizi değiştirmenizi zorunlu tutuyor. Başlamak için lütfen USB veya Bluetooth anahtarınızın Chromebook'unuza bağlı olduğundan emin olun. Klavye tuşlarını da kullanabilirsiniz. +Gelişmiş koruma, kimlik avını ve kötü amaçlı yazılımları engellemek için daha fazla özellik sunar Onay kodu doğrulanıyor... Fiziksel klavye düzeni Ses diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb index 10509956d71bdc..7a5c2cc0b58df7 100644 --- a/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb @@ -1745,7 +1745,6 @@ Не пізніше Налагоджувати Змінювати налаштування доступності -Переглянути налаштування Втиснений текст OK Відкрити термінал для відновлення @@ -1874,7 +1873,6 @@ Налаштуйте зображення профілю Знімок екрана з відкритими програмами Перевірка джерел живлення… -Перевірка параметрів конфіденційності Відкрити як закріплену вкладку Це розширення застаріле; його вимкнено політикою підприємства. Якщо буде доступна нова версія, розширення ввімкнеться автоматично. Сайт @@ -2422,7 +2420,6 @@ Щоб установити Windows, запустіть додаток Parallels Desktop. Переглядати ваші дані на декількох веб-сайтах Цей файл містить конфіденційний контент -Перевіряйте найважливіші налаштування конфіденційності на одній сторінці Заблокувати всі файли cookie третіх сторін Додаткові умови використання Google Chrome і ОС Chrome Оновити обліковий запис @@ -3354,6 +3351,7 @@ Відновити налаштування , ваш адміністратор просить змінити пароль. Перш ніж почати, переконайтеся, що ваш перемикач USB або Bluetooth підключено до Chromebook. Ви також можете використовувати клавіші на клавіатурі. +Покращений захист ще ефективніше блокує фішинг і зловмисне програмне забезпечення Перевірка коду підтвердження… Розкладка фізичної клавіатури Гучність diff --git a/chrome/app/resources/generated_resources_ur.xtb b/chrome/app/resources/generated_resources_ur.xtb index 5335b1e0eea5f9..843dc556dea48e 100644 --- a/chrome/app/resources/generated_resources_ur.xtb +++ b/chrome/app/resources/generated_resources_ur.xtb @@ -1722,7 +1722,6 @@ بعد میں نہیں ڈیبگ کریں اپنی ایکسیسبیلٹی ترتیبات تبدیل کریں -میری ترتیبات کا جائزہ لیں گھٹا ہوا ٹھیک ہے بازیابی ٹرمینل کھولیں @@ -1851,7 +1850,6 @@ اپنے پروفائل کی تصویر سیٹ کریں ان پروگرامز کا اسکرین شاٹ جو فی الحال اسکرین پر موجود ہے پاور کے ذارائع چیک کیے جا رہے ہیں... -رازداری کا جائزہ پن کردہ ٹیب کے بطور کھولیں یہ ایکسٹینشن پرانا ہے اور انٹرپرائز پالیسی کی جانب سے غیر فعال کر دیا گیا ہے۔ ایک نیا ورژن دستیاب ہو جانے پر یہ خود بخود فعال ہو سکتا ہے۔ سائٹ @@ -2397,7 +2395,6 @@ ‏براہ کرم Windows انسٹال کرنے کیلئے Parallels ڈیسک ٹاپ شروع کریں۔ متعدد ویب سائٹس پر اپنا ڈیٹا پڑھیں اس فائل میں حساس مواد ہے -ایک ہی جگہ پر انتہائی اہم رازداری کی ترتیبات کو سمجھیں اور ان کا جائزہ لیں سبھی فریق ثالث کوکیز کو مسدود کریں ‏Google Chrome اور Chrome OS کی اضافی شرائط اکاؤنٹ اپ ڈیٹ کریں @@ -3328,6 +3325,7 @@ ترتیبات بحال کریں ، آپ کا منتظم آپ سے اپنا پاس ورڈ تبدیل کرنے کا مطالبہ کرتا ہے۔ ‏شروع کرنے کے لیے، براہ کرم یقینی بنائیں کہ آپ کا USB یا بلوٹوتھ سوئچ آپ کی Chromebook سے منسلک ہے۔ آپ کی بورڈ کلیدوں کا بھی استعمال کر سکتے ہیں۔ +فریب دہی اور میلوئیر کو مسدود کرنے کیلئے بہتر کردہ حفاظت مزید کام کرتی ہے توثیقی کوڈ کی توثیق کی جا رہی ہے... جسمانی کی بورڈ لے آؤٹ والیوم diff --git a/chrome/app/resources/generated_resources_uz.xtb b/chrome/app/resources/generated_resources_uz.xtb index d9e0fbdcd32460..2aea68e5755839 100644 --- a/chrome/app/resources/generated_resources_uz.xtb +++ b/chrome/app/resources/generated_resources_uz.xtb @@ -1729,7 +1729,6 @@ kichiklashtirish uchun Ctrl+Alt+Yorqinlikni pasaytirish tugmalarini bosing.Bundan kechiktirmasdan Nosozliklarni ko‘rib chiqish Maxsus imkoniyatlar sozlamalarini o‘zgartirish -Sozlamalarni koʻrib chiqish Botiq Ok Tiklash terminalini ochish @@ -1858,7 +1857,6 @@ kichiklashtirish uchun Ctrl+Alt+Yorqinlikni pasaytirish tugmalarini bosing.Profilga rasm joylang Joriy ekrandagi dasturlarning skrinshoti Quvvat manbalari tekshirilmoqda… -Maxfiylik sozlamalarini ochish Qadalgan tab sifatida ochish Ushbu kengaytma eskirgan, shuning uchun u korporativ siyosat shartlariga ko‘ra o‘chirib qo‘yildi. Yangi versiyasi chiqishi bilan bu kengaytma avtomatik yoqilishi mumkin. Sayt @@ -2406,7 +2404,6 @@ kichiklashtirish uchun Ctrl+Alt+Yorqinlikni pasaytirish tugmalarini bosing.Windowsni oʻrnatish uchun Parallels Desktopni ishga tushiring. Bir nechta saytlardagi ma’lumotlarni ko‘rish Bu faylda maxfiy kontent bor -Eng muhim maxfiylik sozlamalari bilan tanishing va bir joyda koʻrib chiqing Barcha tashqi cookie fayllarni bloklash Google Chrome va Chrome OS qoʻshimcha shartlari Hisobni yangilash @@ -2514,6 +2511,7 @@ kichiklashtirish uchun Ctrl+Alt+Yorqinlikni pasaytirish tugmalarini bosing.Family Link orqali saytlar va qurilmadan foydalanish vaqtiga cheklovlarni sozlash Qurilmaga parametrni oʻrnatib boʻlmadi. Taxminan qoldi +Ekranni ajratish va ish stollarini almashtirish kabi amallar tebranish bilan tasdiqlansin. &Imlo tekshiruvi Bu jarayon bir necha daqiqa olishi mumkin. Linux konteyneri sozlanmoqda. Chromedagi oxirgi varaqlarni telefondan koʻring @@ -3338,6 +3336,7 @@ kichiklashtirish uchun Ctrl+Alt+Yorqinlikni pasaytirish tugmalarini bosing.Dastlabki sozlamalarni tiklash , administratoringiz parolingizni o‘zgartirishni so‘rayapti. Boshlash uchun USB yoki Bluetooth kalit Chromebookka ulangan boʻlishi kerak. Klaviaturadagi tugmalardan foydalanishingiz ham mumkin. +Kengaytirilgan himoya fishing va zararli dasturlarni bloklaydi Tasdiqlash kodi tekshirilmoqda... Tashqi klaviatura tugmalari tartibi Hajmi @@ -4914,6 +4913,7 @@ Ochiq eksponenta ( bit): Telefoningizni tekshiring Chrome brauzeri va launcherida asosiy qidiruv tizimi sifatida belgilash Smart Lock himoyasini yoqish uchun telefondagi asosiy profilga oʻting +Bu jurnal qaydlari Fayllarim jildida quyidagi faylga saqlandi: Til va kiritish usuli sozlamalarini o‘zgartirish Qurilmani nomlash: Ushbu sahifani bosh ekranga qadab qo‘yish... @@ -5691,6 +5691,7 @@ maqsadlarida foydalanishi mumkin. Bu ruxsatni myaccount.google.com/activitycontr Tashqi elektron kalit yoki xavfsizlik sensori {NUM_EXTENSIONS,plural, =1{Kengaytma rad etildi}other{# ta kengaytma rad etildi}} Yangilanish bajarildi +Bosish sezgirligi Kiritish tarnoviga qogʻoz solinmagan ” qurilmasida ma’lumot yozishda atribut uzunligi oshib ketdi. 1 ta printer saqlangan. @@ -6822,6 +6823,7 @@ Kalit faylini ishonchli joyda saqlang. U kengaytmaning yangi versiyalarini yarat guruhi – Ulanish oynasi Google virtual printeri +Sezgir aloqa Rasm sifatida chop etish Ilovaga tegishli axborotlar – bu, ilovalar tomonidan saqlangan (dasturchi o‘rnatgan sozlamalarga asoslanib) kontaktlar, xabarlar va rasmlar kabi maʼlumotlar Zaxiralangan axborotlar farzandingizning Drive ombori sigʻimiga ta’sir qilmaydi. diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb index 4fc5a0f19548bb..69ebf667218ea3 100644 --- a/chrome/app/resources/generated_resources_vi.xtb +++ b/chrome/app/resources/generated_resources_vi.xtb @@ -1737,7 +1737,6 @@ và Ctrl+Alt+Giảm độ sáng để thu nhỏ. Không được Sau Gỡ lỗi Thay đổi cài đặt trợ năng của bạn -Xem xét các chế độ cài đặt của tôi Hạ xuống Ok Mở Cửa sổ lệnh khôi phục @@ -1866,7 +1865,6 @@ và Ctrl+Alt+Giảm độ sáng để thu nhỏ. Đặt ảnh hồ sơ của bạn Ảnh chụp các chương trình có trên màn hình Đang kiểm tra nguồn điện... -Xem xét về quyền riêng tư Mở dưới dạng thẻ được ghim Tiện ích này là đã lỗi thời và bị chính sách doanh nghiệp vô hiệu hóa. Tiện ích có thể được bật tự động khi có phiên bản mới hơn. Trang web @@ -2411,7 +2409,6 @@ và Ctrl+Alt+Giảm độ sáng để thu nhỏ. Vui lòng chạy ứng dụng Parallels Desktop để cài đặt Windows. Đọc dữ liệu của bạn trên một số trang web Tệp này có chứa nội dung nhạy cảm -Hiểu và xem xét các chế độ cài đặt quyền riêng tư quan trọng nhất tại cùng một nơi Chặn tất cả cookie của bên thứ ba Các điều khoản bổ sung của Google Chrome và Chrome OS Cập nhật tài khoản @@ -3341,6 +3338,7 @@ và Ctrl+Alt+Giảm độ sáng để thu nhỏ. Khôi phục cài đặt , quản trị viên của bạn yêu cầu bạn thay đổi mật khẩu của mình. Để bắt đầu, hãy nhớ kết nối công tắc USB hoặc Bluetooth với Chromebook. Bạn cũng có thể dùng các phím trên bàn phím. +Chế độ bảo vệ tăng cường giúp chặn phần mềm độc hại và hành vi lừa đảo hiệu quả hơn Đang xác minh mã xác nhận... Bố cục của bàn phím thực Âm lượng diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb index 6d5b96971c1376..263567faa8e00c 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb @@ -1719,7 +1719,6 @@ 不晚于 调试 更改您的无障碍设置 -查看我的设置 凹陷 确定 打开恢复终端 @@ -1848,7 +1847,6 @@ 设置您的个人资料照片 当前屏幕所含程序的屏幕截图 正在检查电源… -查看隐私设置 在固定标签页中打开 此扩展程序已过期并已根据企业政策停用。当有新版本时,它可能会自动启用。 网站 @@ -2394,7 +2392,6 @@ 请启动 Parallels Desktop 以安装 Windows。 读取您在一些网站上的数据 此文件包含敏感内容 -在一处集中了解和查看最重要的隐私设置 拦截所有第三方 Cookie Google Chrome 和 Chrome 操作系统附加条款 更新帐号 @@ -3324,6 +3321,7 @@ 还原设置 ,您的管理员要求您更改密码。 首先,请确保您的 USB 或蓝牙开关已连接到您的 Chromebook。您还可以使用键盘按键。 +“增强型保护”选项在防范网上诱骗和恶意软件方面更高一筹 正在验证确认码… 实体键盘布局 音量 diff --git a/chrome/app/resources/generated_resources_zh-HK.xtb b/chrome/app/resources/generated_resources_zh-HK.xtb index 3ae3dbfa3f275f..10b94a0961ead9 100644 --- a/chrome/app/resources/generated_resources_zh-HK.xtb +++ b/chrome/app/resources/generated_resources_zh-HK.xtb @@ -252,6 +252,7 @@ 正在執行 Linux 還原 擴充功能錯誤 無法安裝「」:圖片網址已傳回 錯誤代碼。請聯絡您的管理員。 +裝置 (共 個),名為「」的平板電腦 缺少預期的開頭大括弧: 此操作會清除網站儲存的資料 (共 ),以及所安裝的應用程式 正在掃瞄流動數據網絡… @@ -438,6 +439,7 @@ 已選取 個項目 設定使用中的 Kerberos 票證 這項設定是由裝置擁有者「」管理。 +裝置 (共 個),名為「」的手機 無法為主題背景載入「」。 再次按下「」鍵即可確認指派設定並 另存為單一檔案網頁 @@ -869,6 +871,7 @@ 攝錄機已開啟 新增位置… 信任這個用於識別軟件製造商的憑證 +裝置 (共 個),名為「」的不明裝置 此資料夾中沒有內容 您有安裝任何特殊的 VPN、Proxy、防火牆或 NAS 軟件 嗎? @@ -1244,6 +1247,7 @@ 檔案資料 要從 Google 取得圖片說明嗎? 您的裝置由您的機構管理 +裝置 (共 個),名為「」的遊戲控制器 在分頁視窗中開啟 例如:1-5、8、11-13 使用系統檢視器開啟 @@ -1737,7 +1741,6 @@ 此日期之前 偵錯 變更您的協助工具設定 -查看我的設定 內凹 確定 開啟復原終端機 @@ -1866,7 +1869,6 @@ 設定您的個人檔案相片 目前畫面上面嘅程式螢幕截圖 正在檢查電源… -私隱審核 在固定分頁中開啟 這項擴充功能已過時,並根據企業政策停用。當日後有更新版本可用,系統可能會自動啟用該功能。 網站 @@ -2007,6 +2009,7 @@ 複製標籤 在您的 上執行 Linux 工具、編輯器和整合開發環境 (IDE)。瞭解詳情 重設權限 +裝置 (共 個),名為「」的音訊裝置 {NUM_DAYS,plural, =1{ 要求您在今天內連接 Wi-Fi 並下載更新,或使用按用量收費連線的下載更新 (可能需支付費用)。}other{ 要求您連接 Wi-Fi 並在期限前下載更新,或使用按用量收費連線的下載更新 (可能需支付費用)。}} 您確定要取消流動數據服務設定程序嗎? 索引數據庫 @@ -2312,6 +2315,7 @@ 偵測到卸除式裝置 提供咗 Emoji 建議。㩒向上鍵或者向下鍵就可以導覽,㩒 Enter 鍵就可以插入 Emoji。 記憶體使用量 +無法與裝置「」配對,請選取裝置後再試一次 連線錯誤 完成 憑證政策限制 @@ -2412,7 +2416,6 @@ 請啟動 Parallels Desktop 以安裝 Windows。 讀取您在部分網站上的資料 此檔案含有敏感內容 -集中一處查看及瞭解最重要的私隱設定 封鎖所有第三方 Cookie Google Chrome 和 Chrome 作業系統的《附加條款》 更新帳戶 @@ -3143,6 +3146,7 @@ 自訂字詞 新分頁(&T) 您隨時可在設定中選擇要同步的資料。 +開啟安全瀏覽強化防護功能後,即可獲得 Chrome 最強大的安全防護 關閉螢幕保護程式 外星人 意見反映報告 @@ -3343,6 +3347,7 @@ 還原設定 ,管理員要求您變更密碼。 如要開始使用,請先確保 USB 或藍牙開關已連接 Chromebook。您亦可以使用鍵盤按鍵。 +強化保護功能可進一步封鎖仿冒詐騙和惡意軟件 正在驗證確認碼… 實體鍵盤配置 音量 @@ -3648,6 +3653,7 @@ 下載 使用您的麥克風 裝置磁碟的儲存空間嚴重不足 +裝置 (共 個),名為「」的電腦 系統在您瀏覽此網頁時已設定下列 Cookie 允許「Android 訊息」由您的手機轉送短訊至 Chromebook 您具備下列組織的識別憑證 @@ -3829,6 +3835,7 @@ 」要求與序列連接埠連線 此驗證服務由 代管 如要設定指紋,請讓子女輕觸開關按鈕。系統會妥善地將您子女的指紋資料儲存在此 上,絕不會外洩。 +你將獲得標準防護 {COUNT,plural, =1{1 個檔案}other{# 個檔案}} 動作 預設橙色圖片 @@ -4413,6 +4420,7 @@ 示範註冊要求發生問題。 重設裝置並不會影響您的 Google 帳戶,以及任何與這些帳戶同步處理的數據。不過,裝置中所有本機儲存檔案將被刪除。 自動登入 +翻譯為的作業已完成 Microsoft Windows 硬件驅動程式驗證 無法將裝置加入網域。請再試一次,或聯絡您的裝置擁有者或管理員。錯誤代碼: 主選單 @@ -5826,6 +5834,7 @@ {NUM_MINS,plural, =1{1 分鐘前已執行安全檢查}other{{NUM_MINS} 分鐘前已執行安全檢查}} 無法取得應用程式資料,正在嘗試繼續執行應用程式… 隱藏的網絡 +裝置 (共 個),名為「」的滑鼠 設為自動啟動 允許最近關閉的網站完成傳送和接收資料動作 (建議) 正在處理捷徑… @@ -5989,6 +5998,7 @@ Wi-Fi 網絡 列印服務 讀取您複製並貼上的資料 +裝置 (共 個),名為「」的攝影機 變形 應用程式沒有回應。選取「強制關閉」即可關閉應用程式。 此登入服務是由 代管 @@ -6785,6 +6795,7 @@ 讀取使用合成語音朗讀的所有文字 要求 (預設) 檔案 +裝置 (共 個),名為「」的鍵盤 提供意見 文字透明度 沒有回應。 @@ -6808,6 +6819,7 @@ 請輸入有效的電郵地址 適用於特定影片網站 已連接 USB 鍵盤 +側邊搜尋 到期年份 畫面不穩定 檢查裝置 (&I) @@ -6923,6 +6935,7 @@ 您的書籤、密碼、記錄和其他設定會同步至所有裝置 內容 {NUM_TABS,plural, =1{將分頁新增至閱讀清單}other{將分頁新增至閱讀清單}} +重新開啟 隱藏所有資訊卡 裝置資料 備份至「Google 雲端硬碟」。您可隨時輕鬆還原資料或改用其他裝置。備份包含應用程式資料。備份會上載至 Google,並使用您子女的 Google 帳戶密碼加密。瞭解詳情 @@ -6996,6 +7009,7 @@ 傳送至您的裝置 詢問是否把網頁翻譯為您慣用的語言 立即重新整理 +正在配對「 已移除縮圖。 一律顯示完整網址 正在上載… @@ -7233,9 +7247,11 @@ 新增語言 正在登入。 即時網絡共享連線失敗 +已關閉安全瀏覽強化防護功能 抱歉!嘗試加入網域時發生錯誤,請再試一次。 Netscape 憑證更新網址 按鍵音效 +重新開啟 否 (限 Http) 升級 請輸入正確格式的網址 diff --git a/chrome/app/resources/generated_resources_zh-TW.xtb b/chrome/app/resources/generated_resources_zh-TW.xtb index 7b2897068421f6..06bc254de50050 100644 --- a/chrome/app/resources/generated_resources_zh-TW.xtb +++ b/chrome/app/resources/generated_resources_zh-TW.xtb @@ -250,6 +250,7 @@ 目前正在執行 Linux 還原作業 擴充功能錯誤 無法安裝 :映像檔網址傳回 錯誤代碼。請與管理員聯絡。 +裝置 (共 個),名為「」的平板電腦 缺少左大括弧: 這會清除網站儲存的資料 (共 ),以及所安裝的應用程式 正在掃描行動數據網路… @@ -436,6 +437,7 @@ 已選取 個項目 設定使用中的 Kerberos 票證 這項設定是由裝置擁有者「」管理。 +裝置 (共 個),名為「」的手機 無法載入主題的「」。 再次按下「」鍵即可確認指派設定並 另存為單一檔案網頁 @@ -859,6 +861,7 @@ 攝影機已開啟 新增位置... 信任這個用於識別軟體製造商的憑證 +裝置 (共 個),名為「」的不明裝置 這個資料夾是空的 你是否安裝了任何特殊的 VPN、Proxy、防火牆或網路附加儲存 (NAS) 軟體? 找不到序列埠 @@ -1233,6 +1236,7 @@ 檔案資訊 要取得 Google 提供的圖片說明嗎? 這部裝置是由貴機構管理 +裝置 (共 個),名為「」的遊戲控制器 在分頁視窗中開啟 例如:1-5、8、11-13 使用系統檢視器開啟 @@ -1723,7 +1727,6 @@ 此日期之前: 偵錯 變更你的無障礙設定 -審查我的設定 內凹 確定 開啟復原終端機 @@ -1852,7 +1855,6 @@ 設定你的個人資料圖片 目前畫面上程式的螢幕截圖 正在檢查電源... -隱私權審查 在固定分頁中開啟 這項過舊的擴充功能現已依企業政策停用。如有可用的新版本,則可能會自動重新啟用。 網站 @@ -1993,6 +1995,7 @@ 複製分頁 上執行 Linux 工具、編輯器和 IDE。瞭解詳情 重設權限 +裝置 (共 個),名為「」的音訊裝置 {NUM_DAYS,plural, =1{ 要求你在今天內透過 Wi-Fi 連線下載更新,或使用計量付費連線下載更新 (可能要支付流量費用)。}other{ 要求你在期限內透過 Wi-Fi 連線下載更新,或使用計量付費連線下載更新 (可能要支付流量費用)。}} 你確定要取消行動數據服務設定程序嗎? 索引資料庫 @@ -2298,6 +2301,7 @@ 偵測到卸除式裝置 已提供表情符號建議。使用向上鍵或向下鍵進行瀏覽,按下 Enter 鍵即可插入表情符號。 記憶體使用量 +無法與裝置「」配對,請選取裝置後再試一次 連線錯誤 完成 憑證原則限制 @@ -2398,7 +2402,6 @@ 請啟動 Parallels Desktop 以安裝 Windows。 讀取你在多個網站上產生的資料 這個檔案含有敏感內容 -在同一處審查及瞭解最重要的隱私權設定 封鎖所有第三方 Cookie Google Chrome 和 Chrome 作業系統的《附加條款》 更新帳戶 @@ -3128,6 +3131,7 @@ 自訂字詞 新增分頁(&T) 你隨時可以在設定中選擇要同步處理的資料。 +開啟安全瀏覽強化防護功能後,即可獲得 Chrome 最強大的安全防護 關閉螢幕保護程式 外星人 意見回饋報告 @@ -3328,6 +3332,7 @@ 還原設定 ,管理員要求你變更密碼。 首先,請確認 USB 或藍牙開關已連接至 Chromebook。你也可以使用鍵盤按鍵。 +強化防護功能可進一步封鎖網路詐騙和惡意軟體 正在驗證確認碼… 實體鍵盤配置 音量 @@ -3632,6 +3637,7 @@ 下載 使用你的麥克風 裝置磁碟空間嚴重不足 +裝置 (共 個),名為「」的電腦 系統在你瀏覽這個網頁時設定了下列 Cookie 允許 Android 訊息將簡訊內容從手機轉送到 Chromebook 您有這些機構核發給您的憑證 @@ -3813,6 +3819,7 @@ 」要求與序列埠連線 這是由 代管的驗證服務 如要設定指紋,請讓孩子輕觸電源按鈕。孩子的指紋資料會安全儲存在這部 上,絕不會外洩。 +你將獲得標準防護 {COUNT,plural, =1{1 個檔案}other{# 個檔案}} 動作 預設的橘色顯示圖片 @@ -4396,6 +4403,7 @@ 示範註冊要求發生問題。 重設裝置並不會影響你的 Google 帳戶,以及任何與這些帳戶同步處理的資料。不過,所有儲存在裝置中的資料將會遭到刪除。 自動登入 +翻譯為的作業已完成 Microsoft Windows 硬體驅動程式驗證 無法將裝置加入網域。請再試一次,或與裝置擁有者或系統管理員聯絡。錯誤代碼: 主選單 @@ -5809,6 +5817,7 @@ {NUM_MINS,plural, =1{1 分鐘前已執行安全檢查}other{{NUM_MINS} 分鐘前已執行安全檢查}} 無法取得應用程式資料,正在嘗試繼續執行應用程式... 隱藏的網路 +裝置 (共 個),名為「」的滑鼠 設為自動啟動 允許最近關閉的網站完成資料收發作業 (建議) 正在處理捷徑... @@ -5972,6 +5981,7 @@ Wi-Fi 網路 列印服務 讀取你複製和貼上的資料 +裝置 (共 個),名為「」的攝影機 轉換 應用程式沒有回應。選取「強制關閉」即可關閉應用程式。 這是由 代管的登入服務。 @@ -6768,6 +6778,7 @@ 讀取使用合成語音朗讀的所有文字 詢問 (預設) 檔案 +裝置 (共 個),名為「」的鍵盤 提供意見 文字不透明度 」沒有回應。 @@ -6791,6 +6802,7 @@ 請輸入有效的電子郵件地址 適用於特定影片網站 已連接 USB 鍵盤 +側邊搜尋 到期年份 畫面不穩定 檢查裝置 (&I) @@ -6906,6 +6918,7 @@ 你的書籤、密碼和歷史記錄等資料會在所有裝置上保持同步 內容 {NUM_TABS,plural, =1{將分頁新增至閱讀清單}other{將分頁新增至閱讀清單}} +重新開啟 隱藏所有資訊卡 裝置資訊 備份到 Google 雲端硬碟。你隨時可以輕鬆還原資料或改用其他裝置。備份內容包含應用程式資料。備份內容會上傳到 Google,並以貴子女帳戶的 Google 帳戶密碼加密。瞭解詳情 @@ -6979,6 +6992,7 @@ 傳送至你的裝置 詢問是否將網頁翻譯成你慣用的語言 立即更新 +正在配對「 已移除縮圖。 一律顯示完整網址 上傳中... @@ -7216,9 +7230,11 @@ 新增語言 登入中。 即時網路共用連線失敗 +已關閉安全瀏覽強化防護功能 糟糕!嘗試加入網域時發生錯誤,請再試一次。 Netscape 憑證更新網址 按鍵音效 +重新開啟 否 (限 Http) 升級 請輸入正確格式的網址 diff --git a/chrome/app/resources/generated_resources_zu.xtb b/chrome/app/resources/generated_resources_zu.xtb index 326f3525b647ba..ba82abcd2a73da 100644 --- a/chrome/app/resources/generated_resources_zu.xtb +++ b/chrome/app/resources/generated_resources_zu.xtb @@ -1737,7 +1737,6 @@ bese u-Ctrl+Alt+Brightness down ukuze uhlehlise isithombe. Hhayi ngemuva Lungisa isiphazamisi Shintsha izilungiselelo zakho zokufinyelela -Buyekeza amasethingi wami Icindezelwe phansi Ok Vula itheminali yokubuyisela @@ -1866,7 +1865,6 @@ bese u-Ctrl+Alt+Brightness down ukuze uhlehlise isithombe. Setha isithombe sakho sephrofayela Isithombe-skrini sezinhlelo manje ezikusikrini Ihlola imithombo yesiphequluli... -Ukubuyekeza kobumfihlo Vula njengethebhu ephiniwe Lesi sandiso siphelelwe isikhathi futhi sikhutshazwe inqubomgomo yebhizinisi. Singahle sinikwe amandla ngokuzenzakalelayo uma inguqulo entsha itholakala. Isayithi @@ -2412,7 +2410,6 @@ I- idinga ukuba ugcine ikhadi lakho elimsathi lifakiwe.Sicela uqalise i-Parallels Desktop ukuze ufake i-Windows. Funda idatha yakho kumawebhusayithi athile Leli fayela linokuqukethwe okuzwelayo -Qonda futhi ubuyekeze amasethingi wobumfihlo abucayi kakhulu endaweni eyodwa Vimba wonke amakhukhi wenkampani yangaphandle I-Google Chrome Nemigomo Yokungezwa ye-Chrome OS Buyekeza i-akhawunti @@ -3342,6 +3339,7 @@ I- idinga ukuba ugcine ikhadi lakho elimsathi lifakiwe.Buyisela izilungiselelo , umlawuli wakho udinga ukuthi ushintshe iphasiwedi yakho. Ukuze uqalise, sicela uqiniseke ukuthi i-USB yakho noma iswishi ye-Bluethooth ixhunyiwe ku-Chromebook yakho. Ungasebenzisa nokhiye bekhibhodi yakho. +Isivikelo esithuthukisiwe senza okuningi ukuvimba ubugebengu bokweba imininingwane ebucayi kanye uhlelo olungayilungele ikhompyutha Iqinisekisa ikhodi yokuqinisekisa... Uhlaka lwekhibhodi engokoqobo Ivolumu diff --git a/chrome/app/resources/google_chrome_strings_af.xtb b/chrome/app/resources/google_chrome_strings_af.xtb index c001d8b9a76bb1..2beca7bfb2776d 100644 --- a/chrome/app/resources/google_chrome_strings_af.xtb +++ b/chrome/app/resources/google_chrome_strings_af.xtb @@ -61,6 +61,7 @@ Sommige kenmerke kan dalk nie beskikbaar wees nie en veranderings aan voorkeure Chrome het toestemming nodig om toegang te kry tot jou kamera en mikrofoon vir hierdie werf Chrome kan nie jou wagwoorde nagaan nie. Probeer later weer. Enige Chrome-data wat tydens die gebruik van hierdie profiel gegenereer word (soos die skepping van boekmerke, geskiedenis, wagwoorde, en ander instellings) kan deur die werkprofieladministrateur verwyder word. +Gaan voort Google Chrome kon nie jou data sinkroniseer nie, omdat sinkronisering nie vir jou domein beskikbaar is nie. Google Chrome wil jou wagwoorde uitvoer. Tik jou Windows-wagwoord in om dit toe te laat. Deïnstalleer @@ -145,6 +146,7 @@ Sommige kenmerke kan dalk nie beskikbaar wees nie en veranderings aan voorkeure is by Chrome gevoeg Chrome kan nie jou wagwoorde nagaan nie, want jy is nie aangemeld nie Google Chrome-bedryfstelsel +Verbeterde beskerming doen meer om uitvissing en wanware te blokkeer Chrome – Netwerkaanmelding – 'n Ander handeling in Google Chrome vind tans plaas. Probeer asseblief later weer. Chrome-bedryfstelsel kon nie jou data sinkroniseer nie weens 'n fout met aanmelding. diff --git a/chrome/app/resources/google_chrome_strings_am.xtb b/chrome/app/resources/google_chrome_strings_am.xtb index a3c5d6bcc792a5..9b3142a2b4439e 100644 --- a/chrome/app/resources/google_chrome_strings_am.xtb +++ b/chrome/app/resources/google_chrome_strings_am.xtb @@ -60,6 +60,7 @@ Chrome ለዚህ ጣቢያ የእርስዎን ካሜራ እና ማይክሮፎን ለመድረስ ፈቃድ ያስፈልገዋል Chrome የእርስዎን የይለፍ ቃላት መፈተሽ አይችልም። ቆይተው እንደገና ይሞክሩ። ይህን መገለጫ በሚጠቀሙበት ጊዜ የመነጨ ማንኛውም የChrome ውሂብ (እንደ የዕልባቶች፣ ታሪክ፣ የይለፍ ቃላት እና ሌሎች ቅንብሮች መፈጠር ያለ) በስራ መገለጫ አስተዳዳሪው ሊወገድ ይችላል። +ቀጥል ማመሳሰል ለጎራዎ ስለማይገኝ Google Chrome ውሂብዎን ማመሳሰል አልቻለም። Google Chrome የእርስዎን የይለፍ ቃላት ወደ ውጭ መላክ ይፈልጋል። ይህንን ለመፍቀድ የWindows የይለፍ ቃልዎን ይተይቡ። አራግፍ @@ -144,6 +145,7 @@ ወደ Chrome ታክሏል እርስዎ በመለያ ስላልገቡ ስለሆኑ Chrome የይለፍ ቃላትዎን መፈተሽ አይችልም Google Chrome ስርዓተ ክወና +የተሻሻለ ጥበቃ ማስገር እና ተንኮል-አዘል ዌር ለማገድ የበለጠ ይሠራል Chrome - በአውታረ መረብ ወደ መለያ መግባት - በGoogle Chrome ላይ ሌላ ሥርዓተ ክወና በሂደት ላይ ነው። እባክዎ በኋላ ላይ እንደገና ይሞክሩ። Chrome OS እየተገባ ሳለ በተፈጠረ አንድ ስህተት ምክንያት ውሂብዎን ማመሳሰል አልቻለም። diff --git a/chrome/app/resources/google_chrome_strings_ar.xtb b/chrome/app/resources/google_chrome_strings_ar.xtb index c7cf20c7b76cc8..4c49f2a958ee4a 100644 --- a/chrome/app/resources/google_chrome_strings_ar.xtb +++ b/chrome/app/resources/google_chrome_strings_ar.xtb @@ -59,6 +59,7 @@ ‏يحتاج Chrome إلى إذن للوصول إلى الكاميرا والميكروفون من أجل الموقع الإلكتروني هذا. ‏يتعذّر على Chrome التحقّق من كلمات المرور. يُرجى إعادة المحاولة. ‏يمكن لمشرف الملف الشخصي للعمل إزالة أي بيانات مرتبطة بمتصفِّح Chrome والتي يتم إنشاؤها أثناء استخدام هذا الملف الشخصي (مثل إنشاء الإشارات المرجعية والسجلّ وكلمات المرور والإعدادات الأخرى). +متابعة ‏تعذر على Google Chrome مزامنة البيانات نظرًا لأن المزامنة غير متاحة في نطاقك. ‏يرغب Google Chrome في تصدير كلمات مرورك، لذا يُرجى كتابة كلمة مرور Windows للسماح بذلك. إزالة التثبيت @@ -143,6 +144,7 @@ ‏تمت إضافة إلى Chrome ‏يتعذّر على Chrome التحقّق من كلمات المرور لأنك لم تسجّل الدخول. ‏نظام تشغيل Google Chrome +يؤدي تفعيل إعداد "الحماية المُحسَّنة" إلى حظر التصيّد الاحتيالي والبرامج الضارّة. ‏Chrome - تسجيل الدخول إلى الشبكة - ‏عملية أخرى على Google Chrome قيد التقدم. يُرجى المحاولة مرة أخرى لاحقًا. ‏تعذر على نظام التشغيل Chrome مزامنة البيانات نظرًا لوجود خطأ في تسجيل الدخول. diff --git a/chrome/app/resources/google_chrome_strings_as.xtb b/chrome/app/resources/google_chrome_strings_as.xtb index dc90f64dee7d30..75650f80fd46af 100644 --- a/chrome/app/resources/google_chrome_strings_as.xtb +++ b/chrome/app/resources/google_chrome_strings_as.xtb @@ -61,6 +61,7 @@ এই ছাইটটোত আপোনাৰ কেমেৰা আৰু মাইক্ৰ’ফ’ন এক্সেছ কৰিবলৈ Chromeক অনুমতিৰ আৱশ্যক Chromeএ আপোনাৰ পাছৱর্ডসমূহ পৰীক্ষা কৰিব নোৱাৰে। পাছত আকৌ চেষ্টা কৰক। কৰ্মস্থানৰ প্ৰ’ফাইলৰ প্ৰশাসকে এই প্ৰ’ফাইলৰ ব্যৱহাৰৰ সময়ত সৃষ্টি হোৱা যিকোনো Chrome ডেটা (যেনে, বুকমাৰ্কৰ সৃষ্টি, ইতিহাস, পাছৱৰ্ড আৰু অন্য ছেটিং) আঁতৰাব পাৰে। +অব্যাহত ৰাখক আপোনাৰ ড’মেইনত ছিংক কৰা সুবিধাটো নাই বাবে Google Chromeএ আপোনাৰ ডেটা ছিংক কৰিব নোৱাৰে। Google Chromeএ আপোনাৰ পাছৱর্ডসমূহ ৰপ্তানি কৰিব খোজে। এই কার্যৰ বাবে অনুমতি দিবলৈ আপোনাৰ Windowsৰ পাছৱর্ড দিয়ক। আনইনষ্টল কৰক @@ -145,6 +146,7 @@ Chromeত যোগ কৰা হ’ল আপুনি ছাইন ইন হৈ নথকাৰ বাবে Chromeএ আপোনাৰ পাছৱর্ডসমূহ পৰীক্ষা কৰিব নোৱাৰে Google Chrome OS +বৰ্ধিত সুৰক্ষাৰ সুবিধাটোৱে ফিশ্বিং আৰু মালৱেৰ অৱৰোধ কৰিবলৈ অধিক কাৰ্য কৰে Chrome - নেটৱর্কত ছাইন ইন - Google Chromeত অন্য এটা কার্য চলি আছে। অনুগ্ৰহ কৰি কিছু সময়ৰ পাছত পুনৰ চেষ্টা কৰক। কোনো ছাইন ইন সম্পর্কীয় আসোঁৱাহৰ বাবে Chrome OSএ আপোনাৰ ডেটা ছিংক কৰিব নোৱাৰিলে। diff --git a/chrome/app/resources/google_chrome_strings_az.xtb b/chrome/app/resources/google_chrome_strings_az.xtb index b5b79f096c8ec4..304effb41b36e2 100644 --- a/chrome/app/resources/google_chrome_strings_az.xtb +++ b/chrome/app/resources/google_chrome_strings_az.xtb @@ -58,6 +58,7 @@ Bəzi funksiyalar əlçatmaz ola bilər ki, nəticədə tərcihlərə edilən d Chrome bu sayt üçün kamera və mikrofona giriş tələb edir Chrome parollarınızı yoxlaya bilmir. Sonra yenidən cəhd edin. Bu profilin istifadəsi zamanı yaranan hər hansı bir Chrome datası (əlfəcinlər, tarixçələr, parolların yaradılması və digər ayarlar kimi) iş profili administratoru tərəfindən silinə bilər. +Davam edin Google Chrome datanızı sinxronizasiya edə bilmədi, çünki sinxronizasiya domeniniz üçün əlçatan deyil. Google Chrome parolları eksport etmək istəyir. Buna icazə vermək üçün Windows parolunuzu yazın. Sistemdən silin @@ -142,6 +143,7 @@ Bəzi funksiyalar əlçatmaz ola bilər ki, nəticədə tərcihlərə edilən d Chrome'a əlavə edildi Hesaba daxil olmadığınız üçün Chrome parollarınızı yoxlaya bilmir Google Chrome OS +Təkmil qoruma ilə fişinq və zərərli proqramların bloklanması üçün daha çox iş görülür Chrome - Şəbəkəyə Giriş - Google Chrome'da digər əməliyyat davam edir. Sonra cəhd edin. Hesaba giriş xətası üzündən Chrome OS datanızı sinxronlaşdıra bilmədi. diff --git a/chrome/app/resources/google_chrome_strings_be.xtb b/chrome/app/resources/google_chrome_strings_be.xtb index f09d0bd0ebc71a..4ebedceaf92f2e 100644 --- a/chrome/app/resources/google_chrome_strings_be.xtb +++ b/chrome/app/resources/google_chrome_strings_be.xtb @@ -60,6 +60,7 @@ Chrome запытвае дазвол на доступ да вашай камеры і мікрафона для гэтага сайта Браўзеру Chrome не ўдаецца праверыць паролі. Паўтарыце спробу пазней. Любыя даныя Chrome, створаныя пры выкарыстанні гэтага профілю (напрыклад, закладкі, гісторыя, паролі і іншыя налады), могуць быць выдалены адміністратарам працоўнага профілю. +Працягнуць Браўзеру Google Chrome не ўдалося сінхранізаваць даныя: для вашага дамена сінхранізацыя недаступная. Google Chrome запытвае дазвол на экспартаванне вашых пароляў. Каб дазволіць гэта, увядзіце пароль Windows. Выдаліць @@ -144,6 +145,7 @@ Пашырэнне дададзена ў Chrome Chrome не можа праверыць вашы паролі, пакуль вы не ўвойдзеце ва ўліковы запіс АС Google Chrome +Функцыя палепшанай абароны яшчэ надзейней блакіруе фішынг і шкодныя праграмы Chrome – Уваход у сетку – У Google Chrome выконваецца іншая аперацыя. Паўтарыце спробу пазней. Сістэма Chrome OS не змагла сінхранізаваць даныя з-за памылкі ўваходу. diff --git a/chrome/app/resources/google_chrome_strings_bg.xtb b/chrome/app/resources/google_chrome_strings_bg.xtb index 226693254f4e2f..8c8f0e809363eb 100644 --- a/chrome/app/resources/google_chrome_strings_bg.xtb +++ b/chrome/app/resources/google_chrome_strings_bg.xtb @@ -59,6 +59,7 @@ Chrome се нуждае от разрешение за достъп до камерата и микрофона ви за този сайт Chrome не може да провери паролите ви. Опитайте пак по-късно. Данните в Chrome, които са генерирани при използването на този служебен потребителски профил (напр. създаването на отметки, историята, паролите и други настройки), могат да бъдат премахнати от администратора му. +Напред Google Chrome не можа да синхронизира данните ви, защото синхронизирането не е налице за домейна ви. Google Chrome иска да експортира паролите ви. За да разрешите това, въведете паролата си за Windows. Деинсталиране @@ -143,6 +144,7 @@ Разширението бе добавено към Chrome Chrome не може да провери паролите ви, защото не сте влезли в профила си Google Chrome OS +Режимът за подобрена защита предприема повече действия за блокиране на фишинг атаки и злонамерен софтуер Chrome – Вход в мрежата – Извършва се друго действие, свързано с Google Chrome. Моля, опитайте отново по-късно. Chrome OS не можа да синхронизира данните ви поради грешка при влизане в профила. diff --git a/chrome/app/resources/google_chrome_strings_bn.xtb b/chrome/app/resources/google_chrome_strings_bn.xtb index 8e36cdf782d180..5b933cce6a4b1e 100644 --- a/chrome/app/resources/google_chrome_strings_bn.xtb +++ b/chrome/app/resources/google_chrome_strings_bn.xtb @@ -59,6 +59,7 @@ এই সাইটটির জন্য Chrome কে আপনার ক্যামেরা এবং মাইক্রোফোনে অ্যাক্সেস দিতে হবে Chrome আপনার পাসওয়ার্ড চেক করতে পারছে না। পরে আবার চেষ্টা করুন। এই প্রোফাইল ব্যবহার করার সময় জেনারেট হওয়া Chrome ডেটা (যেমন বুকমার্ক, ইতিহাস, পাসওয়ার্ড ও অন্যান্য সেটিংস) অফিস প্রোফাইল অ্যাডমিনিস্ট্রেটর মুছে দিতে পারেন। +চালিয়ে যান আপনার ডোমেনে সিঙ্ক উপলভ্য না থাকার কারণে Google Chrome সিঙ্ক করতে পারেনি৷ Google Chrome আপনার পাসওয়ার্ড এক্সপোর্ট করতে চাইছে। অনুমতি দিতে Windows এর পাসওয়ার্ড টাইপ করুন। আনইনস্টল @@ -143,6 +144,7 @@ Chrome-এ যোগ করা হয়েছে সাইন-ইন করে না থাকার কারণে Chrome আপনার পাসওয়ার্ড চেক করতে পারছে না Google Chrome OS +ফিশিং ও ম্যালওয়্যার ব্লক করার ব্যাপারে উন্নত সুরক্ষা আরও সাহায্য করে Chrome - নেটওয়ার্ক সাইন-ইন - Google Chrome এ আরেকটি ক্রিয়াকলাপ প্রক্রিয়ায় আছে। দয়া করে পরে আবার চেষ্টা করুন৷ সাইন ইনে ত্রুটির কারণে Chrome OS আপনার ডেটা সিঙ্ক করতে পারেনি৷ diff --git a/chrome/app/resources/google_chrome_strings_bs.xtb b/chrome/app/resources/google_chrome_strings_bs.xtb index af0e8edbc106f1..01e3088a61be58 100644 --- a/chrome/app/resources/google_chrome_strings_bs.xtb +++ b/chrome/app/resources/google_chrome_strings_bs.xtb @@ -61,6 +61,7 @@ uparivanjem. Chromeu treba odobrenje za pristup vašoj kameri i mikrofonu na ovoj web lokaciji Chrome ne može provjeravati vaše lozinke. Pokušajte ponovo kasnije. Administrator radnog profila može ukloniti bilo koje podatke Chromea koji se generiraju tokom korištenja ovog profila (naprimjer kreiranje oznaka, historije, lozinki i drugih postavki). +Nastavi Google Chrome ne može sinhronizirati vaše podatke jer sinhronizacija nije dostupna za vašu domenu. Google Chrome želi izvesti vaše lozinke. Unesite svoju lozinku za Windows da ovo omogućite. Deinstaliraj @@ -145,6 +146,7 @@ uparivanjem. Ekstenzija je dodana u Chrome Chrome ne može provjeravati vaše lozinke jer niste prijavljeni Google Chrome OS +Poboljšana zaštita vas još bolje čuva od krađe identiteta i zlonamjernog softvera Chrome – prijava na mrežu – U toku je druga radnja na Google Chromeu. Pokušajte ponovo kasnije. OS Chrome nije mogao sinkronizirati vaše podatke zbog pogreške prilikom prijave. diff --git a/chrome/app/resources/google_chrome_strings_ca.xtb b/chrome/app/resources/google_chrome_strings_ca.xtb index 8cc82c9f3f1de0..49c8a30d611143 100644 --- a/chrome/app/resources/google_chrome_strings_ca.xtb +++ b/chrome/app/resources/google_chrome_strings_ca.xtb @@ -57,6 +57,7 @@ Per visitar aquest lloc web, Chrome necessita permís per accedir a la càmera i al micròfon Chrome no pot comprovar les teves contrasenyes. Torna-ho a provar més tard. L'administrador del perfil de treball pot suprimir qualsevol dada de Chrome que es generi durant l'ús d'aquest perfil, com ara les adreces d'interès, l'historial, les contrasenyes i altres opcions de configuració. +Continua Google Chrome no ha pogut sincronitzar les dades perquè la sincronització no està disponible per al vostre domini. Google Chrome vol exportar les teves contrasenyes. Escriu la contrasenya de Windows per permetre-ho. Desinstal·la @@ -141,6 +142,7 @@ s'ha afegit a Chrome Chrome no pot comprovar les teves contrasenyes perquè no tens la sessió iniciada Google Chrome OS +La protecció millorada és més efiçaç a l'hora de bloquejar la pesca de credencials i el programari maliciós Chrome - Inici de sessió a la xarxa - Hi ha una altra operació en curs a Google Chrome. Torna-ho a provar més tard. Chrome OS no ha pogut sincronitzar les vostres dades a causa d'un error en iniciar la sessió. diff --git a/chrome/app/resources/google_chrome_strings_cs.xtb b/chrome/app/resources/google_chrome_strings_cs.xtb index eecec7a6303807..3f4df0097e2153 100644 --- a/chrome/app/resources/google_chrome_strings_cs.xtb +++ b/chrome/app/resources/google_chrome_strings_cs.xtb @@ -61,6 +61,7 @@ Některé funkce možná nebudou k dispozici a změny nastavení se neuloží.Chrome pro tento web potřebuje oprávnění k přístupu k fotoaparátu a mikrofonu Chrome nemůže zkontrolovat vaše hesla. Zkuste to později. Veškerá data prohlížeče Chrome vygenerovaná během používání tohoto profilu (jako je vytvoření záložek, historie, hesel a další nastavení) může administrátor pracovního profilu odstranit. +Pokračovat Google Chrome nemohl synchronizovat vaše data, protože Synchronizace ve vaší doméně není k dispozici. Google Chrome chce exportovat vaše hesla. Tato akce vyžaduje zadání hesla systému Windows. Odinstalovat @@ -145,6 +146,7 @@ Některé funkce možná nebudou k dispozici a změny nastavení se neuloží.Do Chromu bylo přidáno rozšíření Chrome nemůže zkontrolovat vaše hesla, protože nejste přihlášeni Google Chrome OS +Vylepšená ochrana vás lépe ochrání před phishingem a malwarem Chrome – přihlášení k síti – V prohlížeči Google Chrome právě probíhá jiná operace. Zkuste to znovu později. Chrome OS vaše data nemohl synchronizovat z důvodu chyby při přihlášení. diff --git a/chrome/app/resources/google_chrome_strings_da.xtb b/chrome/app/resources/google_chrome_strings_da.xtb index f40dd33408f92b..125dcbcc222d81 100644 --- a/chrome/app/resources/google_chrome_strings_da.xtb +++ b/chrome/app/resources/google_chrome_strings_da.xtb @@ -57,6 +57,7 @@ Chrome skal have tilladelse til at bruge dit kamera og din mikrofon på dette website Chrome kan ikke tjekke dine adgangskoder. Prøv igen senere. Alle Chrome-data, der genereres ved brug af denne profil (f.eks. oprettelse af bogmærker, historik, adgangskoder og andre indstillinger) kan fjernes af arbejdsprofilens administrator. +Fortsæt Google Chrome kunne ikke synkronisere dine data, fordi synkronisering ikke er tilgængelig for dit domæne. Google Chrome anmoder om at eksportere dine adgangskoder. Angiv din Windows-adgangskode for at tillade dette. Afinstaller @@ -141,6 +142,7 @@ er føjet til Chrome Chrome kan ikke tjekke dine adgangskoder, da du ikke er logget ind Google Chrome OS +Forbedret beskyttelse gør mere end at blokere phishing og malware Chrome – Login på netværk – En anden handling i Google Chrome er i gang. Prøv igen senere. Chrome OS kunne ikke synkronisere dine data på grund af en fejl under login. diff --git a/chrome/app/resources/google_chrome_strings_de.xtb b/chrome/app/resources/google_chrome_strings_de.xtb index b077369a6c58f3..59cae76ba11b28 100644 --- a/chrome/app/resources/google_chrome_strings_de.xtb +++ b/chrome/app/resources/google_chrome_strings_de.xtb @@ -57,6 +57,7 @@ Chrome benötigt für diese Website die Berechtigung, auf Ihre Kamera und Ihr Mikrofon zuzugreifen Chrome kann Ihre Passwörter nicht prüfen. Versuchen Sie es später noch einmal. Alle Chrome-Daten, die während der Nutzung dieses Profils erstellt werden, wie Lesezeichen, Verlauf, Passwörter und andere Einstellungen, können vom Administrator des Arbeitsprofils entfernt werden. +Weiter Google Chrome konnte Ihre Daten nicht synchronisieren, da die Synchronisierung für Ihre Domain nicht zur Verfügung steht. Google Chrome möchte Ihre Passwörter exportieren. Wenn Sie dies zulassen möchten, geben Sie Ihr Windows-Passwort ein. Deinstallieren @@ -141,6 +142,7 @@ wurde zu Chrome hinzugefügt Chrome kann Ihre Passwörter nicht prüfen, da Sie nicht angemeldet sind Google Chrome OS +Besserer Schutz vor Phishing und Malware durch erweitertes Safe Browsing Chrome – Netzwerkanmeldung – In Google Chrome wird eine andere Aktion durchgeführt. Bitte versuchen Sie es später noch einmal. Chrome OS konnte Ihre Daten aufgrund eines Fehlers bei der Anmeldung nicht synchronisieren. diff --git a/chrome/app/resources/google_chrome_strings_el.xtb b/chrome/app/resources/google_chrome_strings_el.xtb index 1593344ce4137e..95aa5d0c72b109 100644 --- a/chrome/app/resources/google_chrome_strings_el.xtb +++ b/chrome/app/resources/google_chrome_strings_el.xtb @@ -59,6 +59,7 @@ Το Chrome χρειάζεται άδεια, για να αποκτήσει πρόσβαση στην κάμερα και στο μικρόφωνο για αυτόν τον ιστότοπο Το Chrome δεν μπορεί να ελέγξει τους κωδικούς πρόσβασής σας. Δοκιμάστε ξανά αργότερα. Τυχόν δεδομένα Chrome που δημιουργούνται κατά τη χρήση αυτού του προφίλ (όπως η δημιουργία σελιδοδεικτών, ιστορικού, κωδικών πρόσβασης και άλλων ρυθμίσεων) μπορούν να καταργηθούν από τον διαχειριστή του προφίλ εργασίας. +Συνέχεια Το Google Chrome δεν κατάφερε να συγχρονίσει τα δεδομένα σας επειδή ο συγχρονισμός δεν είναι διαθέσιμος για τον τομέα σας. Το Google Chrome θέλει να εξαγάγει τους κωδικούς πρόσβασής σας. Για να το επιτρέψετε αυτό, πληκτρολογήστε τον κωδικό πρόσβασης για τα Windows. Απεγκατάσταση @@ -143,6 +144,7 @@ Η επέκταση προστέθηκε στο Chrome Το Chrome δεν μπορεί να ελέγξει τους κωδικούς πρόσβασής σας επειδή δεν έχετε συνδεθεί. Λειτουργικό σύστημα Google Chrome +Η βελτιωμένη προστασία κάνει περισσότερα για τον αποκλεισμό ηλεκτρονικού ψαρέματος (phishing) και κακόβουλων προγραμμάτων Chrome - Σύνδεση δικτύου - Μια άλλη λειτουργία βρίσκεται σε εξέλιξη στο Google Chrome. Δοκιμάστε ξανά αργότερα. Το Chrome OS δεν μπόρεσε να συγχρονίσει τα δεδομένα σας λόγω σφάλματος κατά τη σύνδεση. diff --git a/chrome/app/resources/google_chrome_strings_en-GB.xtb b/chrome/app/resources/google_chrome_strings_en-GB.xtb index 57dd4b9477e1ae..99d625f3029ee1 100644 --- a/chrome/app/resources/google_chrome_strings_en-GB.xtb +++ b/chrome/app/resources/google_chrome_strings_en-GB.xtb @@ -60,6 +60,7 @@ Some features may be unavailable and changes to preferences won't be saved.Chrome needs permission to access your camera and microphone for this site Chrome can't check your passwords. Try again later. Any Chrome data that is generated during the use of this profile (such as the creation of bookmarks, history, passwords and other settings) can be removed by the work profile administrator. +Continue Google Chrome could not sync your data because Sync is not available for your domain. Google Chrome wants to export your passwords. Type your Windows password to allow this. Uninstall @@ -144,6 +145,7 @@ Some features may be unavailable and changes to preferences won't be saved. has been added to Chrome Chrome can't check your passwords because you're not signed in Google Chrome OS +Enhanced protection does more to block phishing and malware Chrome – Network sign-in – Another operation on Google Chrome is in progress. Please try again later. Chrome OS could not sync your data due to an error signing in. diff --git a/chrome/app/resources/google_chrome_strings_es-419.xtb b/chrome/app/resources/google_chrome_strings_es-419.xtb index 7bceb1bccd29cb..36ad533ff5bdf7 100644 --- a/chrome/app/resources/google_chrome_strings_es-419.xtb +++ b/chrome/app/resources/google_chrome_strings_es-419.xtb @@ -57,6 +57,7 @@ Chrome necesita permiso para acceder a tu cámara y micrófono para este sitio Chrome no puede revisar las contraseñas. Vuelve a intentarlo más tarde. El administrador del perfil de trabajo puede quitar cualquier dato de Chrome que se genere durante el uso de este perfil (como la creación de favoritos, un historial, contraseñas y otras opciones de configuración). +Continuar Google Chrome no pudo sincronizar los datos porque la sincronización no está disponible para el dominio. Google Chrome desea exportar tus contraseñas. Para permitirlo, ingresa tu contraseña de Windows. Desinstalación @@ -141,6 +142,7 @@ Se agregó a Chrome Chrome no puede revisar las contraseñas porque no accediste a tu cuenta SO de Google Chrome +La protección mejorada permite bloquear mejor la suplantación de identidad (phishing) y el software malicioso. Chrome: Acceso a la red - Hay otra operación en Google Chrome en curso. Vuelve a intentarlo más tarde. El Chrome OS no pudo sincronizar los datos porque se produjo un error de acceso. diff --git a/chrome/app/resources/google_chrome_strings_es.xtb b/chrome/app/resources/google_chrome_strings_es.xtb index 47f666fcbea04b..f280e26dccc4b5 100644 --- a/chrome/app/resources/google_chrome_strings_es.xtb +++ b/chrome/app/resources/google_chrome_strings_es.xtb @@ -61,6 +61,7 @@ Es posible que algunas funciones no estén disponibles y que no se guarden los c Chrome necesita permiso para acceder a la cámara y al micrófono en este sitio web Chrome no puede comprobar tus contraseñas. Vuelve a intentarlo más tarde. El administrador del perfil de trabajo puede quitar cualquier dato de Chrome generado durante el uso de este perfil, como los marcadores, el historial, las contraseñas y otros ajustes. +Continuar Google Chrome no ha podido sincronizar los datos porque la función de sincronización no está disponible para tu dominio. Google Chrome quiere exportar tus contraseñas. Escribe tu contraseña de Windows para permitirlo. Desinstalar @@ -145,6 +146,7 @@ Es posible que algunas funciones no estén disponibles y que no se guarden los c se ha añadido a Chrome Chrome no puede comprobar tus contraseñas porque no has iniciado sesión Google Chrome OS +La protección mejorada es más eficaz para bloquear ataques de suplantación de identidad y software malicioso. Chrome, inicio de sesión en la red, Hay otra operación en curso en Google Chrome. Vuelve a intentarlo más tarde. Chrome OS no ha podido sincronizar los datos debido a un error de inicio de sesión. diff --git a/chrome/app/resources/google_chrome_strings_et.xtb b/chrome/app/resources/google_chrome_strings_et.xtb index ec464d0f43c13e..6343ecf29a5d1a 100644 --- a/chrome/app/resources/google_chrome_strings_et.xtb +++ b/chrome/app/resources/google_chrome_strings_et.xtb @@ -58,6 +58,7 @@ Chrome vajab selle saidi puhul luba, et teie kaamerale ja mikrofonile juurde pääseda Chrome ei saa teie paroole kontrollida. Proovige hiljem uuesti. Kõik Chrome'i andmed, mis luuakse selle profiili kasutamise ajal (nt järjehoidjad, ajalugu, paroolid ja muud seaded), saab tööprofiili administraator eemaldada. +Jätka Google Chrome ei saa teie andmeid sünkroonida, sest sünkroonimine pole teie domeenil saadaval. Google Chrome soovib teie paroole eksportida. Selle lubamiseks sisestage oma Windowsi parool. Desinstalli @@ -142,6 +143,7 @@ on Chrome'i lisatud Chrome ei saa teie paroole kontrollida, kuna te pole sisse logitud Google Chrome OS +Täiustatud kaitse aitab andmepüüki ja pahavara paremini blokeerida Chrome – võrku sisselogimine – Teine toiming on Google Chrome'is pooleli. Proovige hiljem uuesti. Chrome OS ei saanud teie andmeid sünkroonida sisselogimisvea tõttu. diff --git a/chrome/app/resources/google_chrome_strings_eu.xtb b/chrome/app/resources/google_chrome_strings_eu.xtb index 4d262472ce91e0..598d30d2be6695 100644 --- a/chrome/app/resources/google_chrome_strings_eu.xtb +++ b/chrome/app/resources/google_chrome_strings_eu.xtb @@ -60,6 +60,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak Chrome-k webgune honen izenean kamera eta mikrofonoa atzitzeko baimena behar du Chrome-k ezin ditu egiaztatu pasahitzak. Saiatu geroago. Laneko profilaren administratzaileak kendu egin ditzake profil hau erabiltzean sortutako Chrome-ko datuak (adibidez, sortutako laster-markak, historia, pasahitzak eta bestelako ezarpenak). +Egin aurrera Google Chrome-k ezin izan ditu sinkronizatu zure datuak, sinkronizazioa ez dagoelako erabilgarri zure domeinuan. Google Chrome-k pasahitzak esportatu nahi ditu. Hori baimentzeko, idatzi Windows pasahitza. Desinstalatu @@ -144,6 +145,7 @@ Eginbide batzuk agian dira erabilgarri egongo eta hobespenei egindako aldaketak Gehitu da Chrome-n Chrome-k ezin ditu egiaztatu pasahitzak saioa hasi ez duzulako Google Chrome OS +Babes handiagoa eskaintzen du phishingaren eta malwarearen aurka Chrome - Hasi saioa sarean - Beste eragiketa bat ari da egiten Google Chrome. Saiatu berriro geroago. Saioa hastean gertatu den errore bat dela-eta, Chrome OS-ek ezin izan ditu sinkronizatu zure datuak. diff --git a/chrome/app/resources/google_chrome_strings_fa.xtb b/chrome/app/resources/google_chrome_strings_fa.xtb index 205aa563e36edf..b072f94077a706 100644 --- a/chrome/app/resources/google_chrome_strings_fa.xtb +++ b/chrome/app/resources/google_chrome_strings_fa.xtb @@ -57,6 +57,7 @@ ‏Chrome برای این سایت به مجوز دسترسی به دوربین و میکروفون نیاز دارد ‏Chrome نمی‌تواند گذرواژه‌هایتان را بررسی کند. بعداً دوباره امتحان کنید. ‏سرپرست نمایه کاری می‌تواند داده‌های Chrome را که درطول استفاده از این نمایه ایجاد شده‌اند (مثل ایجاد سابقه نشانک‌ها، گذرواژه‌ها، و دیگر تنظیمات) بردارد. +ادامه ‏Google Chrome قادر به همگام‌سازی داده‌های شما نبود زیرا همگام‌سازی برای دامنه شما قابل دسترسی نیست. ‏Google Chrome می‌خواهد گذرواژه‌های شما را صادر کند. برای اجازه به این کار، گذرواژه Windows خود را تایپ کنید. حذف نصب @@ -141,6 +142,7 @@ به Chrome اضافه شده است ‏چون به سیستم وارد نشده‌اید، Chrome نمی‌تواند گذرواژه‌هایتان را بررسی کند ‏سیستم‌عامل Google Chrome +«محافظت بهبودیافته» کارهای بیشتری برای مسدود کردن رمزگیری و بدافزار انجام می‌دهد ‏Chrome - ورود به سیستم شبکه - ‏عملکرد دیگری در Google Chrome درحال انجام است. لطفاً بعداً دوباره امتحان کنید. ‏به دلیل وجود یک خطای ورود به سیستم، سیستم‌عامل Chrome قادر به همگام‌سازی داده‌هایتان نبود. diff --git a/chrome/app/resources/google_chrome_strings_fi.xtb b/chrome/app/resources/google_chrome_strings_fi.xtb index a27ed75733a367..8c60763b8253e7 100644 --- a/chrome/app/resources/google_chrome_strings_fi.xtb +++ b/chrome/app/resources/google_chrome_strings_fi.xtb @@ -57,6 +57,7 @@ Chrome tarvitsee oikeuden käyttää kameraasi ja mikrofoniasi tällä sivustolla. Chrome ei voi tarkistaa salasanojasi. Yritä myöhemmin uudelleen. Työprofiilin järjestelmänvalvoja voi poistaa tämän profiilin käytön aikana luotua Chrome-dataa (esim. kirjanmerkit, historia, salasanat ja muut asetukset). +Jatka Google Chrome ei voinut synkronoida tietoja, koska synkronointi ei ole käytettävissä verkkotunnuksessasi. Google Chrome yrittää viedä salasanojasi tiedostoon. Salli tämä kirjoittamalla Windows-salasanasi. Poista @@ -141,6 +142,7 @@ on lisätty Chromeen Chrome ei voi tarkistaa salasanojasi, koska et ole kirjautuneena sisään Google Chrome OS +Parannettu suojaus torjuu tietojenkalastelua ja haittaohjelmia entistä tehokkaammin Chrome – Kirjautuminen verkkoon – Toinen Google Chrome ‑prosessi on jo käynnissä. Yritä myöhemmin uudelleen. Chrome-käyttöjärjestelmä ei voi synkronoida tietoja kirjautumisvirheen vuoksi. diff --git a/chrome/app/resources/google_chrome_strings_fil.xtb b/chrome/app/resources/google_chrome_strings_fil.xtb index 19b5f783faf08c..f9f9554d266ffc 100644 --- a/chrome/app/resources/google_chrome_strings_fil.xtb +++ b/chrome/app/resources/google_chrome_strings_fil.xtb @@ -61,6 +61,7 @@ Maaaring hindi available ang ilang tampok at hindi mase-save ang mga pagbabago s Kailangan ng Chrome ng pahintulot na i-access ang iyong camera at mikropono para sa site na ito Hindi masuri ng Chrome ang iyong mga password. Subukan ulit sa ibang pagkakataon. Puwedeng alisin ng administrator ng profile sa trabaho ang anumang data ng Chrome na nabuo sa panahon ng paggamit sa profile na ito (gaya ng paggawa ng mga bookmark, history, mga password, at iba pang setting). +Magpatuloy Hindi mai-sync ng Google Chrome ang iyong data dahil hindi available ang Pag-sync para sa iyong domain. Gustong i-export ng Google Chrome ang iyong mga password. I-type ang password mo sa Windows para payagan ito. I-uninstall @@ -145,6 +146,7 @@ Maaaring hindi available ang ilang tampok at hindi mase-save ang mga pagbabago s Naidagdag na ang sa Chrome Hindi masusuri ng Chrome ang iyong mga password dahil hindi ka naka-sign in Google Chrome OS +Mas maraming magagawa ang pinahusay na proteksyon para mag-block ng phishing and malware Chrome - Pag-sign in sa Network - May kasalukuyang isinasagawang isa pang pagpapatakbo sa Google Chrome. Pakisubukang muli sa ibang pagkakataon. Hindi ma-sync ng Chrome OS ang iyong data dahil sa isang error sa pagsa-sign in. diff --git a/chrome/app/resources/google_chrome_strings_fr-CA.xtb b/chrome/app/resources/google_chrome_strings_fr-CA.xtb index 928529a768dc6d..21ab3cb01b8cbf 100644 --- a/chrome/app/resources/google_chrome_strings_fr-CA.xtb +++ b/chrome/app/resources/google_chrome_strings_fr-CA.xtb @@ -60,6 +60,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles et les modificat Chrome a besoin de votre autorisation pour accéder à votre appareil photo et à votre micro pour ce site Chrome ne peut pas vérifier vos mots de passe. Réessayez plus tard. L'administrateur du profil professionnel peut retirer toutes les données Chrome générées durant l'utilisation de ce profil (comme la création de favoris, l'historique, les mots de passe et d'autres paramètres). +Continuer Google Chrome ne peut pas synchroniser vos données, car la synchronisation n'est pas offerte pour votre domaine. Google Chrome veut exporter vos mots de passe. Pour autoriser cette action, entrez votre mot de passe Windows. Désinstaller @@ -144,6 +145,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles et les modificat L'extension «  » a été ajoutée à Chrome Chrome ne peut pas vérifier vos mots de passe parce que vous n'êtes pas connecté. Google Chrome OS +La protection renforcée en fait plus pour bloquer l'hameçonnage et les logiciels nuisibles Chrome – Connexion au réseau – Une autre opération est en cours sur Google Chrome. Veuillez réessayer plus tard. Chrome OS ne peut pas synchroniser vos données, car une erreur s'est produite lors de la connexion. diff --git a/chrome/app/resources/google_chrome_strings_fr.xtb b/chrome/app/resources/google_chrome_strings_fr.xtb index cced2b7361df81..3a5674cd91764e 100644 --- a/chrome/app/resources/google_chrome_strings_fr.xtb +++ b/chrome/app/resources/google_chrome_strings_fr.xtb @@ -60,6 +60,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles, et les modifica Chrome a besoin de votre autorisation pour accéder à votre appareil photo et à votre micro pour ce site Chrome ne parvient pas à vérifier vos mots de passe. Réessayez plus tard. Toutes les données Chrome générées quand vous utilisez ce profil (comme la création de favoris, l'historique, les mots de passe etc.) peuvent être supprimées par l'administrateur du profil professionnel. +Continuer Impossible de synchroniser vos données dans Google Chrome, car la synchronisation n'est pas disponible pour votre domaine. Google Chrome veut exporter vos mots de passe. Pour autoriser cette action, saisissez votre mot de passe Windows. Désinstaller @@ -144,6 +145,7 @@ Certaines fonctionnalités ne seront peut-être pas disponibles, et les modifica L'extension a été ajoutée à Chrome Chrome ne peut pas vérifier vos mots de passe, car vous n'êtes pas connecté Google Chrome OS +La protection renforcée assure une meilleure protection contre l'hameçonnage et les logiciels malveillants Chrome - Connexion au réseau - Une autre opération est en cours dans Google Chrome. Veuillez réessayer ultérieurement. Impossible de synchroniser vos données dans Chrome OS, car une erreur s'est produite lors de la connexion. diff --git a/chrome/app/resources/google_chrome_strings_gl.xtb b/chrome/app/resources/google_chrome_strings_gl.xtb index 7cb8bf0d941d7f..6739222a47a18d 100644 --- a/chrome/app/resources/google_chrome_strings_gl.xtb +++ b/chrome/app/resources/google_chrome_strings_gl.xtb @@ -60,6 +60,7 @@ Chrome necesita permiso para acceder á cámara e ao micrófono neste sitio Chrome non puido comprobar os teus contrasinais. Téntao de novo máis tarde. O administrador do perfil de traballo pode quitar os datos de Chrome que se xeren durante o uso deste perfil (por exemplo, os marcadores, o historial, os contrasinais e outras opcións de configuración). +Continuar Google Chrome non puido sincronizar os teus datos porque a sincronización non está dispoñible para o teu dominio. Google Chrome quere exportar os teus contrasinais. Escribe o teu contrasinal de Windows para permitir esta acción. Desinstalar @@ -144,6 +145,7 @@ Engadiuse a extensión a Chrome Chrome non puido comprobar os teus contrasinais porque non iniciaches sesión Google Chrome OS +A protección mellorada é máis eficaz á hora de bloquear o phishing e o software malicioso Chrome (inicio de sesión, ) Hai outra operación en Google Chrome que está en curso. Téntao de novo máis tarde. Chrome OS non puido sincronizar os teus datos debido a un erro ao iniciar sesión. diff --git a/chrome/app/resources/google_chrome_strings_gu.xtb b/chrome/app/resources/google_chrome_strings_gu.xtb index 50982aa39b0d05..3c373d73a55a78 100644 --- a/chrome/app/resources/google_chrome_strings_gu.xtb +++ b/chrome/app/resources/google_chrome_strings_gu.xtb @@ -61,6 +61,7 @@ Chromeને આ સાઇટ માટે તમારા કૅમેરા અને માઇક્રોફોનના ઍક્સેસની પરવાનગીની જરૂર પડે છે Chrome તમારા પાસવર્ડ ચેક કરી શકતું નથી. થોડા સમય પછી ફરી પ્રયાસ કરો. આ પ્રોફાઇલના ઉપયોગ (જેમકે બુકમાર્ક, ઇતિહાસ, પાસવર્ડ બનાવવા અને અન્ય સેટિંગ ગોઠવવા) દરમિયાન જનરેટ થયેલા કોઈપણ Chrome ડેટાને ઑફિસની પ્રોફાઇલના વ્યવસ્થાપક કાઢી નાખી શકે છે. +આગળ વધો Google Chrome તમારા ડેટાને સમન્વયિત કરી શક્યું નથી કારણ કે તમારા ડોમેન માટે સમન્વયન ઉપલબ્ધ નથી. Google Chrome તમારા પાસવર્ડની નિકાસ કરવા માગે છે. આને મંજૂરી આપવા માટે તમારો Windows પાસવર્ડ ટાઇપ કરો. અનઇન્સ્ટૉલ કરો @@ -145,6 +146,7 @@ ને Chromeમાં ઉમેરવામાં આવ્યું છે તમે સાઇન ઇન કરેલું ન હોવાને કારણે Chrome તમારા પાસવર્ડ ચેક કરી શકતું નથી Google Chrome OS +વધારેલી સુરક્ષા ફિશિંગ અને માલવેરને બ્લૉક કરવામાં વધુ સહાયરૂપ થાય છે Chrome - નેટવર્ક સાઇન ઇન - Google Chrome પર બીજી ક્રિયા ચાલુ છે. કૃપા કરીને પછીથી ફરી પ્રયાસ કરો. સાઇન ઇનમાં ભૂલ આવવાને કારણે Chrome OS તમારા ડેટાને સિંક કરી શક્યું નથી. diff --git a/chrome/app/resources/google_chrome_strings_hi.xtb b/chrome/app/resources/google_chrome_strings_hi.xtb index a966a65d4c9dc5..8cca1a3f3bd3b9 100644 --- a/chrome/app/resources/google_chrome_strings_hi.xtb +++ b/chrome/app/resources/google_chrome_strings_hi.xtb @@ -57,6 +57,7 @@ Chrome को इस साइट के लिए आपका कैमरा और माइक्रोफ़ोन एक्सेस करने की अनुमति चाहिए Chrome आपके पासवर्ड की जांच नहीं कर सकता. बाद में कोशिश करें. इस प्रोफ़ाइल का इस्तेमाल करने के दौरान Chrome में जनरेट किए गए किसी भी तरह के डेटा (जैसे कि बुकमार्क बनाना, इतिहास, पासवर्ड, और दूसरी सेटिंग) को वर्क प्रोफ़ाइल का एडमिन हटा सकता है. +जारी रखें Google Chrome आपका डेटा समन्‍वयित नहीं कर सका क्‍योंकि समन्‍वयन आपके डोमेन के लिए उपलब्‍ध नहीं है. Google Chrome आपके पासवर्ड निर्यात करना चाहता है. इसकी मंज़ूरी देने के लिए अपना Windows पासवर्ड लिखें. विस्थापित करें @@ -141,6 +142,7 @@ को Chrome में जोड़ दिया गया है Chrome आपके पासवर्ड की जांच नहीं कर सकता, क्योंकि आपने साइन इन नहीं किया है Google Chrome OS +बेहतर सुरक्षा की मदद से फ़िशिंग और मैलवेयर को बेहतर तरीके से ब्लॉक किया जाता है Chrome - नेटवर्क में साइन इन करें - Google Chrome पर कोई और क्रिया चल रही है. कृपया बाद में फिर से कोशिश करें. प्रवेश करने संबंधी गड़बड़ी के कारण Chrome OS आपका डेटा सिंक नहीं कर सका. diff --git a/chrome/app/resources/google_chrome_strings_hr.xtb b/chrome/app/resources/google_chrome_strings_hr.xtb index fc0b87c8517412..69f132ff753411 100644 --- a/chrome/app/resources/google_chrome_strings_hr.xtb +++ b/chrome/app/resources/google_chrome_strings_hr.xtb @@ -57,6 +57,7 @@ Chrome treba dopuštenje za pristup kameri i mikrofonu za ovu web-lokaciju Chrome ne može provjeriti vaše zaporke. Pokušajte ponovno kasnije. Sve podatke iz Chromea koji se generiraju tijekom upotrebe ovog profila (primjerice izradom oznaka, povijesti, zaporki i drugih postavki) može ukloniti administrator poslovnog profila. +Nastavi Google Chrome nije mogao sinkronizirati vaše podatke jer sinkronizacija nije dostupna za vašu domenu. Google Chrome želi izvesti vaše zaporke. Upišite svoju zaporku za Windows da biste to dopustili. Deinstaliraj @@ -141,6 +142,7 @@ Proširenje dodano je u Chrome Chrome ne može provjeriti vaše zaporke jer niste prijavljeni Google Chrome OS +Poboljšana zaštita blokira krađu identiteta i zlonamjerni softver na više načina Chrome – Prijava na mrežu – U tijeku je neka druga operacija na Google Chromeu. Pokušajte ponovo kasnije. OS Chrome nije mogao sinkronizirati vaše podatke zbog pogreške prilikom prijave. diff --git a/chrome/app/resources/google_chrome_strings_hu.xtb b/chrome/app/resources/google_chrome_strings_hu.xtb index 99dd5f3dc17116..1285c0d99a5ff2 100644 --- a/chrome/app/resources/google_chrome_strings_hu.xtb +++ b/chrome/app/resources/google_chrome_strings_hu.xtb @@ -57,6 +57,7 @@ A Chrome-nak engedélyre van szüksége ahhoz, hogy hozzáférjen a kamerához és a mikrofonhoz ennél a webhelynél A Chrome nem tudja ellenőrizni a jelszavait. Próbálkozzon később. A profil használata során generált összes Chrome-adatot (pl. könyvjelzőket, előzményeket, jelszavakat és egyéb beállításokat) eltávolíthatja a munkaprofil rendszergazdája. +Tovább A Google Chrome nem tudta szinkronizálni az adatait, mert a szinkronizálás nem érhető el az Ön domainjénél. A Google Chrome exportálni szeretné a jelszavakat. Ennek engedélyezéséhez írja be Windows-jelszavát. Eltávolítás @@ -141,6 +142,7 @@ A(z) hozzá lett adva a Chrome-hoz A Chrome nem tudja ellenőrizni az Ön jelszavait, mert nincs bejelentkezve Google Chrome OS +A Speciális védelem még többet tesz annak érdekében, hogy letiltsa az adathalászatot és a rosszindulatú programokat Chrome – Hálózati bejelentkezés – Egy másik Google Chrome-művelet is folyamatban van. Próbálkozzon újra később. A Chrome OS egy bejelentkezési hiba miatt nem tudta szinkronizálni az adatokat. diff --git a/chrome/app/resources/google_chrome_strings_hy.xtb b/chrome/app/resources/google_chrome_strings_hy.xtb index 81aa41bd989fae..cb4d7ee0fc9ef1 100644 --- a/chrome/app/resources/google_chrome_strings_hy.xtb +++ b/chrome/app/resources/google_chrome_strings_hy.xtb @@ -58,6 +58,7 @@ Chrome-ին այս կայքի համար անհրաժեշտ է ձեր տեսախցիկն ու խոսափողը օգտագործելու թույլտվություն Chrome-ը չի կարող ստուգել ձեր գաղտնաբառերը։ Փորձեք ավելի ուշ։ Աշխատանքային պրոֆիլի ադմինիստրատորը կարող է ջնջել Chrome-ի բոլոր տվյալները, որոնք ստեղծվում են այս պրոֆիլի օգտագործման ընթացքում (օրինակ՝ էջանիշներ, պատմություն, գաղտնաբառեր և այլ կարգավորումներ)։ +Շարունակել Google Chrome-ը չկարողացավ համաժամացնել ձեր տվյալները, քանի որ Sync ծառայությունը մատչելի չէ ձեր տիրույթի համար: Google Chrome-ն ուզում է արտահանել ձեր գաղտնաբառերը: Թույլատրելու համար մուտքագրեք Windows-ի ձեր գաղտնաբառը: Ապատեղադրել @@ -142,6 +143,7 @@ ընդլայնումն ավելացվել է Chrome-ին Chrome-ը չի կարող ստուգել ձեր գաղտնաբառերը, քանի որ դուք հաշիվ չեք մտել։ Google Chrome OS +Լրացուցիչ պաշտպանությունն օգնում է խուսափել ֆիշինգից և արգելափակել վնասաբեր ծրագրերը Chrome – Ցանցի մուտքի էջ – Google Chrome-ում տեղադրման մեկ այլ գործողություն ընթացքի մեջ է: Փորձեք ավելի ուշ: Մուտքի սխալի պատճառով Chrome OS-ը չկարողացավ համաժամացնել ձեր տվյալները: diff --git a/chrome/app/resources/google_chrome_strings_id.xtb b/chrome/app/resources/google_chrome_strings_id.xtb index 3f120381d6c0a4..ba7fcf95c0f4a9 100644 --- a/chrome/app/resources/google_chrome_strings_id.xtb +++ b/chrome/app/resources/google_chrome_strings_id.xtb @@ -57,6 +57,7 @@ Chrome memerlukan izin akses ke kamera dan mikrofon untuk situs ini Chrome tidak dapat memeriksa sandi Anda. Coba lagi nanti. Data Chrome yang dibuat selama penggunaan profil ini (seperti pembuatan bookmark, histori, sandi, dan setelan lain) dapat dihapus oleh administrator profil kerja. +Lanjutkan Google Chrome tidak dapat menyinkronkan data Anda karena Sinkronisasi tidak tersedia untuk domain Anda. Google Chrome ingin mengekspor sandi. Ketik sandi Windows Anda untuk mengizinkannya. Uninstal @@ -141,6 +142,7 @@ telah ditambahkan ke Chrome Chrome tidak dapat memeriksa sandi karena Anda tidak login OS Google Chrome +Perlindungan yang ditingkatkan akan memblokir phishing dan malware dengan lebih optimal Chrome - Login Jaringan - Operasi lain di Google Chrome sedang berlangsung. Coba lagi nanti. Chrome OS tidak dapat menyinkronkan data Anda karena kesalahan saat masuk. diff --git a/chrome/app/resources/google_chrome_strings_is.xtb b/chrome/app/resources/google_chrome_strings_is.xtb index 7d37ffbc101911..cc22a6a7a6fd33 100644 --- a/chrome/app/resources/google_chrome_strings_is.xtb +++ b/chrome/app/resources/google_chrome_strings_is.xtb @@ -60,6 +60,7 @@ Sumir eiginleikar kunna að vera óaðgengilegir og breytingar á kjörstillingu Chrome þarf leyfi til að nota myndavélina og hljóðnemann á þessu vefsvæði Chrome getur ekki athugað aðgangsorðin þín. Reyndu aftur síðar. Stjórnandi vinnuprófíla getur fjarlægt öll Chrome gögn sem verða til við notkun þessa prófíls (þ.m.t. bókamerki, feril, aðgangsorð og aðrar stillingar). +Halda áfram Google Chrome gat ekki samstillt gögnin þín vegna þess að samstilling er ekki í boði fyrir lénið þitt. Google Chrome vill flytja út aðgangsorðin þín. Sláðu inn Windows-aðgangsorðið þitt til að leyfa það. Fjarlægja @@ -144,6 +145,7 @@ Sumir eiginleikar kunna að vera óaðgengilegir og breytingar á kjörstillingu hefur verið bætt við Chrome Chrome getur ekki athugað aðgangsorðin þín því þú ert ekki skráð(ur) inn Google Chrome OS +Aukin vernd gengur lengra í að loka á vefveiðar og spilliforrit Chrome – innskráning á net – Önnur aðgerð er í gangi í Google Chrome. Reyndu aftur síðar. Chrome OS gat ekki samstillt gögnin þín vegna innskráningarvillu. diff --git a/chrome/app/resources/google_chrome_strings_it.xtb b/chrome/app/resources/google_chrome_strings_it.xtb index e40e8c954020a0..398a87a848a6c8 100644 --- a/chrome/app/resources/google_chrome_strings_it.xtb +++ b/chrome/app/resources/google_chrome_strings_it.xtb @@ -56,6 +56,7 @@ Per questo sito Chrome ha bisogno dell'autorizzazione ad accedere alla fotocamera e al microfono Chrome non può controllare le tue password. Riprova più tardi. Tutti i dati di Chrome generati durante l'utilizzo di questo profilo (come i preferiti, la cronologia, le password e altre impostazioni) possono essere rimossi dall'amministratore del profilo di lavoro. +Continua Impossibile sincronizzare i dati in Google Chrome perché la sincronizzazione non è disponibile per il tuo dominio. Google Chrome vuole esportare le password. Per consentire l'esportazione, digita la tua password Windows. Disinstalla @@ -140,6 +141,7 @@ L'estensione è stata aggiunta a Chrome Chrome non può controllare le tue password perché non hai effettuato l'accesso Google Chrome OS +La protezione avanzata blocca malware e tentativi di phishing con maggiore efficacia Chrome - Accesso rete - C'è un'altra operazione in corso su Google Chrome. Riprova più tardi. Impossibile sincronizzare i dati in Chrome OS a causa di un errore durante l'accesso. diff --git a/chrome/app/resources/google_chrome_strings_iw.xtb b/chrome/app/resources/google_chrome_strings_iw.xtb index 908861afc897c0..abc5b3ba98c03b 100644 --- a/chrome/app/resources/google_chrome_strings_iw.xtb +++ b/chrome/app/resources/google_chrome_strings_iw.xtb @@ -57,6 +57,7 @@ ‏Chrome זקוק להרשאת גישה אל המצלמה והמיקרופון בשביל האתר הזה ‏Chrome לא יכול לבדוק את הסיסמאות שלך. כדאי לנסות שוב מאוחר יותר. ‏המנהל של פרופיל העבודה יכול להסיר נתוני Chrome שמופקים בזמן השימוש בפרופיל (כמו יצירת סימניות, היסטוריה, סיסמאות והגדרות נוספות). +המשך ‏Google Chrome לא הצליח לסנכרן את הנתונים שלך מפני שהסנכרון אינו זמין עבור הדומיין שלך. ‏Google Chrome רוצה לייצא את הסיסמאות שלך. יש להקליד את הסיסמה שלך ל-Windows כדי לאפשר זאת. הסרת התקנה @@ -141,6 +142,7 @@ נוסף ל-‏Chrome ‏Chrome לא יכול לבדוק את הסיסמאות שלך כי לא נכנסת לחשבון Google Chrome OS +עם ההגנה המשופרת, החסימה של פישינג ותוכנות זדוניות מקיפה יותר ‏Chrome – כניסה לרשת – ‏מתבצעת כרגע פעולה אחרת ב-Google Chrome. יש לנסות שוב מאוחר יותר. ‏מערכת ההפעלה של Chrome לא הצליחה לסנכרן את הנתונים שלך עקב שגיאה בתהליך הכניסה. diff --git a/chrome/app/resources/google_chrome_strings_ja.xtb b/chrome/app/resources/google_chrome_strings_ja.xtb index 349ff21e4870ab..4b6dae04110ebe 100644 --- a/chrome/app/resources/google_chrome_strings_ja.xtb +++ b/chrome/app/resources/google_chrome_strings_ja.xtb @@ -56,6 +56,7 @@ このサイトを利用するには、Chrome でカメラとマイクの使用を許可する必要があります Chrome でパスワードを確認できません。しばらくしてからもう一度お試しください。 このプロファイルの使用中に生成された Chrome データ(ブックマーク、履歴、パスワード、他の設定など)は、仕事用プロファイルの管理者によって削除される場合があります。 +続行 お使いのドメインでは同期を利用できないため、Google Chrome はデータを同期できませんでした。 Google Chrome からパスワードをエクスポートするための許可を求められています。許可するには Windows のパスワードを入力してください。 アンインストール @@ -140,6 +141,7 @@ 」が Chrome に追加されました ログインしていないため、Chrome でパスワードを確認できません Google Chrome OS +保護強化機能により、フィッシングを防ぎ、不正なソフトウェアをより強力にブロックします Chrome - ネットワークにログイン - Google Chrome で別の処理が行われています。しばらくしてからもう一度お試しください。 ログイン時にエラーが発生したため、Chrome OS はデータを同期できませんでした。 diff --git a/chrome/app/resources/google_chrome_strings_ka.xtb b/chrome/app/resources/google_chrome_strings_ka.xtb index 0b823f1b01dc16..4f29cef9b000cd 100644 --- a/chrome/app/resources/google_chrome_strings_ka.xtb +++ b/chrome/app/resources/google_chrome_strings_ka.xtb @@ -60,6 +60,7 @@ Chrome საჭიროებს თქვენს კამერასა და მიკროფონზე წვდომის ნებართვას ამ საიტისთვის Chrome ვერ ახერხებს პაროლების შემოწმებას. ცადეთ მოგვიანებით. ამ პროფილის გამოყენებისას შექმნილი Chrome მონაცემების (მაგ., შექმნილი სანიშნეების, ისტორიის, პაროლებისა და სხვა პარამეტრების) ამოშლა შეუძლია სამსახურის პროფილის ადმინისტრატორს. +გაგრძელება Google Chrome-მა ვერ დაასინქრონა თქვენი მონაცემები, რადგან სინქრონიზაცია არ არის ხელმისაწვდომი თქვენი დომენისთვის. Google Chrome ითხოვს თქვენი პაროლების ექსპორტირებას. აღნიშნულის დასაშვებად აკრიფეთ თქვენი Windows-ის პაროლი. დეინსტალაცია @@ -144,6 +145,7 @@ დაემატა Chrome-ს Chrome ვერ ახერხებს თქვენი პაროლების შემოწმებას, რადგან შესული არ ხართ Google Chrome OS +გაძლიერებული დაცვა გთავაზობთ ფიშინგისა და მავნე პროგრამებისგან დაცვის მეტ საშუალებას Chrome — ქსელში შესვლა — Google Chrome-ში სხვა ოპერაცია მიმდინარეობს. გთხოვთ, ცადოთ მოგვიანებით. Chrome OS-მა ვერ დაასინქრონა თქვენი მონაცემები შესვლის შეცდომის გამო. diff --git a/chrome/app/resources/google_chrome_strings_kk.xtb b/chrome/app/resources/google_chrome_strings_kk.xtb index b58fdff73913ab..688f3c0d5f4e74 100644 --- a/chrome/app/resources/google_chrome_strings_kk.xtb +++ b/chrome/app/resources/google_chrome_strings_kk.xtb @@ -60,6 +60,7 @@ Chrome браузеріне бұл сайтта камераны және микрофонды пайдалану үшін рұқсат керек Chrome сіздің құпия сөздеріңізді тексере алмайды. Кейінірек қайталап көріңіз. Жұмыс профилінің әкімшісі осы профильді пайдалану кезінде құрылатын Chrome браузерінің кез келген дерегін (бетбелгілер, тарих, құпия сөздер жасау және басқа параметрлер сияқты) жоя алады. +Жалғастыру Google Chrome деректеріңізді синхрондай алмады, себебі синхрондау функциясы доменіңіз үшін қолжетімді емес. Google Chrome құпия сөздерді экспорттағысы келеді. Бұған рұқсат беру үшін Windows құпия сөзіңізді теріңіз. Жою @@ -144,6 +145,7 @@ кеңейтімі Chrome браузеріне енгізілді Аккаунтқа кірмегендіктен, Chrome сіздің құпия сөздеріңізді тексере алмайды. Google Chrome OS +Жақсартылған қорғаныс фишинг пен зиянды бағдарламаларды бөгеуде көбірек істейді. Chrome – Желіге кіру – Google Chrome браузерінде басқа операция орындалуда. Әрекетті кейінірек қайталаңыз. Кіру кезіндегі қате себебінен Chrome OS деректеріңізді синхрондай алмайды. diff --git a/chrome/app/resources/google_chrome_strings_km.xtb b/chrome/app/resources/google_chrome_strings_km.xtb index 63ddcef79e2241..d3031872adc986 100644 --- a/chrome/app/resources/google_chrome_strings_km.xtb +++ b/chrome/app/resources/google_chrome_strings_km.xtb @@ -61,6 +61,7 @@ Chrome ត្រូវការ​ការអនុញ្ញាត​ដើម្បី​ចូលប្រើ​កាមេរ៉ា និង​មីក្រូហ្វូន​របស់អ្នក​សម្រាប់​ទំព័រនេះ Chrome មិន​អាចពិនិត្យ​ពាក្យសម្ងាត់របស់អ្នកបានទេ។ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ។ អ្នកគ្រប់គ្រងកម្រងព័ត៌មានការងារអាចលុបទិន្នន័យ Chrome ទាំងឡាយ ដែលបង្កើតអំឡុងពេលប្រើកម្រងព័ត៌មាននេះ (ដូចជាការបង្កើតចំណាំ ប្រវត្តិ ពាក្យសម្ងាត់ និងការកំណត់ផ្សេងទៀត)។ +បន្ត Google Chrome មិនអាចធ្វើសមកម្មទិន្នន័យរបស់អ្នកទេ ពីព្រោះ សមកម្ម មិនមានសម្រាប់ដែនរបស់អ្នកទេ។ Google Chrome ចង់​នាំចេញពាក្យ​សម្ងាត់​របស់អ្នក​។ សូមវាយ​បញ្ចូលពាក្យ​សម្ងាត់ Windows របស់អ្នក​ដើម្បីអនុញ្ញាត​ការនាំចេញ​នេះ។ លុបការតំឡើង @@ -145,6 +146,7 @@ ត្រូវបាន​បញ្ចូល​ទៅ Chrome Chrome មិន​អាច​ពិនិត្យពាក្យសម្ងាត់របស់អ្នកបានទេ ដោយសារអ្នកមិនបានចូលគណនី Google Chrome OS +ការការពារ​ដែលប្រសើរជាងមុនធ្វើសកម្មភាពសកម្មជាងមុន ដើម្បីទប់ស្កាត់ការដាក់នុយ និងកម្មវិធីគ្រោះថ្នាក់ Chrome - ការចូល​បណ្ដាញ - ប្រតិបត្តិការផ្សេងទៀតនៅលើ Google Chrome កំពុងដំណើរការ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ។ Chrome OS មិនអាចធ្វើសមកម្មទិន្នន័យរបស់អ្នកទេដោយសារកំហុសឆ្គងការចូល។ @@ -248,6 +250,7 @@ Google Chrome មិនអាចសង្គ្រោះការកំណត់ អ្នកបានចូលទៅក្នុង Chrome ជា . សូមប្រើគណនីដូចគ្នាដើម្បីចូលម្តងទៀត។ លក្ខខណ្ឌ Chrome OS ChromeOS មិនអាចធ្វើសមកម្មទិន្នន័យរបស់អ្នកទេ ពីព្រោះ សមកម្ម មិនមានសម្រាប់ដែនរបស់អ្នកទេ។ +ទទួលបាន​សុវត្ថិភាពខ្លាំង​បំផុតរបស់ Chrome Chrome នឹងចូលប្រើ​ថាស​របស់អ្នក ដើម្បី​ធ្វើការណែនាំ​នៅក្នុង​របារ​អាសយដ្ឋាន Google Chrome Dev ដើម្បី​មើល​ថាតើឧបករណ៍​របស់អ្នក​មានបច្ចុប្បន្នភាពឬអត់ សូម​ចូលទៅកាន់ការកំណត់ Chrome OS @@ -306,6 +309,7 @@ Google Chrome មិនអាចសង្គ្រោះការកំណត់ អ្នកមិនមានសិទ្ធិសមស្របក្នុងការតំឡើងកម្រិតប្រព័ន្ធទេ។ សាកល្បងដំណើរការកម្មវិធីតំឡើងម្តងទៀតក្នុងរបៀបអ្នកគ្រប់គ្រង។ ដំណើរការ Chrome ឡើងវិញ ដើម្បីផ្ញើ​លេខទូរសព្ទពី ទៅទូរសព្ទ Android របស់អ្នក សូមចូល Chrome នៅលើឧបករណ៍​ទាំងពីរ។ +ប្ដូរតាមបំណងនូវ​ជម្រើសឯកជនភាព​ដែល Chrome គិតថា​សំខាន់បំផុត។ ការណែនាំនេះ​មិនរាប់បញ្ចូល​គ្រប់ជម្រើស និងការកំណត់​នោះទេ។ អ្នកកំពុងបញ្ចូលកម្រងព័ត៌មានការងារទៅក្នុងកម្មវិធីរុករកតាមអ៊ីនធឺណិតនេះ និងផ្ដល់លទ្ធភាពឱ្យអ្នកគ្រប់គ្រងរបស់អ្នកគ្រប់គ្រងតែកម្រងព័ត៌មានការងារប៉ុណ្ណោះ។ {0,plural, =0{មាន​កំណែថ្មី​របស់ Chrome ហើយ}=1{មាន​កំណែថ្មី​របស់ Chrome ហើយ}other{មាន​កំណែថ្មី​របស់ Chrome រយៈពេល # ថ្ងៃហើយ}} Chrome OS មិនអាចធ្វើសមកម្មទិន្នន័យរបស់អ្នកទេ ពីព្រោះព័ត៌មានលំអិតគណនីចូលរបស់អ្នកហួសសម័យហើយ។ diff --git a/chrome/app/resources/google_chrome_strings_kn.xtb b/chrome/app/resources/google_chrome_strings_kn.xtb index af180bc2e494b9..ec01cee9703228 100644 --- a/chrome/app/resources/google_chrome_strings_kn.xtb +++ b/chrome/app/resources/google_chrome_strings_kn.xtb @@ -58,6 +58,7 @@ ಈ ಸೈಟ್‌ಗಾಗಿ ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೊಫೋನ್‌ಗೆ ಪ್ರವೇಶಿಸಲು Chrome ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ Chrome ಗೆ ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಈ ಪ್ರೊಫೈಲ್‌ನ ಬಳಕೆಯ ಸಮಯದಲ್ಲಿ ಉತ್ಪತ್ತಿಯಾಗುವ ಯಾವುದೇ Chrome ಡೇಟಾವನ್ನು (ಬುಕ್‌ಮಾರ್ಕ್‌ಗಳು, ಇತಿಹಾಸ, ಪಾಸ್‌ವರ್ಡ್‌ಗಳು ಮತ್ತು ಇತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ರಚನೆಯಂತಹ) ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ನಿರ್ವಾಹಕರು ತೆಗೆದುಹಾಕಬಹುದು. +ಮುಂದುವರೆಸಿ ನಿಮ್ಮ ಡೊಮೇನ್‌ನಲ್ಲಿ ಸಿಂಕ್‌ ಮಾಡುವ ಸೌಲಭ್ಯವಿಲ್ಲದ ಕಾರಣ Google Chrome ಗೆ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. Google Chrome ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ರಫ್ತು ಮಾಡಲು ಬಯಸುತ್ತದೆ. ಇದನ್ನು ಅನುಮತಿಸಲು ನಿಮ್ಮ Windows ಪಾಸ್‌ವರ್ಡ್‌ ಟೈಪ್ ಮಾಡಿ. ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ @@ -142,6 +143,7 @@ Chrome ಗೆ ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ ನೀವು ಸೈನ್ ಇನ್ ಮಾಡಿರದ ಕಾರಣ Chrome ಗೆ ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ Google Chrome OS +ಫಿಶಿಂಗ್ ಮತ್ತು ಮಾಲ್‌ವೇರ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು ವರ್ಧಿತ ಸುರಕ್ಷತೆ ಹೆಚ್ಚಿನ ಸಹಾಯ ಮಾಡುತ್ತದೆ Chrome - ನೆಟ್‌ವರ್ಕ್ ಸೈನ್ ಇನ್ - Google Chrome ನಲ್ಲಿ ಮತ್ತೊಂದು ಕಾರ್ಯಾಚರಣೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ಸೈನ್ ಇನ್ ಮಾಡುವಲ್ಲಿ ದೋಷವಿರುವ ಕಾರಣ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಸಿಂಕ್ ಮಾಡಲು Chrome OS ಗೆ ಸಾಧ್ಯವಿಲ್ಲ. diff --git a/chrome/app/resources/google_chrome_strings_ko.xtb b/chrome/app/resources/google_chrome_strings_ko.xtb index 6a41fdd906b48e..cccaa75553f51f 100644 --- a/chrome/app/resources/google_chrome_strings_ko.xtb +++ b/chrome/app/resources/google_chrome_strings_ko.xtb @@ -61,6 +61,7 @@ 이 사이트에서 카메라와 마이크에 액세스하려면 Chrome에 권한이 필요합니다 Chrome에서 비밀번호를 확인할 수 없습니다. 나중에 다시 시도하세요. 북마크, 방문 기록, 비밀번호, 기타 설정 생성 등 이 프로필을 사용하는 동안 생성된 모든 Chrome 데이터는 직장 프로필 관리자가 삭제할 수 있습니다. +계속 도메인에서 동기화를 사용할 수 없어 Chrome에서 데이터를 동기화하지 못했습니다. Chrome에서 비밀번호를 내보내려고 합니다. 허용하려면 Windows 비밀번호를 입력하세요. 제거 @@ -145,6 +146,7 @@ 이(가) Chrome에 추가됨 로그인되어 있지 않으므로 Chrome에서 비밀번호를 확인할 수 없습니다. Chrome OS +향상된 보호 기능이 피싱 및 멀웨어를 더욱 효과적으로 차단합니다. Chrome - 네트워크 로그인 - Chrome에서 다른 작업이 진행 중입니다. 나중에 다시 시도해 주세요. 로그인 중 오류가 발생하여 Chrome OS에서 데이터를 동기화하지 못했습니다. diff --git a/chrome/app/resources/google_chrome_strings_ky.xtb b/chrome/app/resources/google_chrome_strings_ky.xtb index 9e1a04ff8e4f17..6cd8438257e4de 100644 --- a/chrome/app/resources/google_chrome_strings_ky.xtb +++ b/chrome/app/resources/google_chrome_strings_ky.xtb @@ -61,6 +61,7 @@ Бул сайтта иштөө үчүн Chrome камераңызды жана микрофонуңузду колдонушу керек Chrome сырсөздөрүңүздү текшере албай жатат. Кийинчерээк кайталаңыз. Бул профилди колдонуп жатканда Chrome'до топтолгон бардык маалыматты (түзүлгөн кыстармалар, таржымал, сырсөздөр жана башка жөндөөлөр) жумуш профилинин администратору өчүрө алат. +Улантуу Домениңизде шайкештештирүү аракети жок болгондуктан, Google Chrome дайын-даректериңизди шайкештештире алган жок. Google Chrome сырсөздөрүңүздү экспорттогону жатат. Ага уруксат берүү үчүн Windows аккаунтуңуздун сырсөзүн териңиз. Орнотуудан чыгаруу @@ -145,6 +146,7 @@ Chrome'го кошулду Chrome сырсөздөрүңүздү текшере албайт, анткени аккаунтуңузга кирген жоксуз Google Chrome Иш тутуму +Өркүндөтүлгөн коргоо параметри фишинг жана кесепеттүү программалардан жакшыраак коргойт Chrome – Тармакка кирүү – Google Chrome'до башка операция жүрүп жатат. Кийинчерээк дагы аракет кылып көрүңүз. Chrome OS кирүү катасынан улам дайын-даректериңизди шайкештештире албай койду. diff --git a/chrome/app/resources/google_chrome_strings_lo.xtb b/chrome/app/resources/google_chrome_strings_lo.xtb index 637612ad011a90..7b0ce23421630d 100644 --- a/chrome/app/resources/google_chrome_strings_lo.xtb +++ b/chrome/app/resources/google_chrome_strings_lo.xtb @@ -61,6 +61,7 @@ Chrome ຕ້ອງການການອະນຸຍາດເພື່ອເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ ແລະ ໄມໂຄຣໂຟນຂອງທ່ານສຳລັບເວັບໄຊນີ້ Chrome ບໍ່ສາມາດກວດລະຫັດຜ່ານຂອງທ່ານໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫລັງ. ຜູ້ເບິ່ງແຍງລະບົບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກສາມາດລຶບຂໍ້ມູນ Chrome ໃດໆກໍຕາມທີ່ສ້າງຂຶ້ນໃນລະຫວ່າງການນຳໃຊ້ໂປຣໄຟລ໌ນີ້ (ເຊັ່ນ: ການສ້າງບຸກມາກ, ປະຫວັດ, ລະຫັດຜ່ານ ແລະ ການຕັ້ງຄ່າອື່ນໆ) ອອກໄດ້. +ສືບຕໍ່ Google Chrome ບໍ່​ສາ​ມາດຊິງຄ໌ຂໍ້​ມູນ​ຂອງ​ທ່ານໄດ້ ເພາະວ່າບໍ່ມີການຊິງຄ໌ຢູ່ໃນໂດເມນຂອງທ່ານ. Google Chrome ຕ້ອງການສົ່ງອອກລະຫັດຜ່ານຂອງທ່ານ. ກະລຸນາພິມລະຫັດຜ່ານ Windows ຂອງທ່ານ ເພື່ອອະນຸຍາດສິ່ງນີ້. ຖອນ​ຕິດ​ຕັ້ງ @@ -145,6 +146,7 @@ ເພີ່ມ ໃສ່ Chrome ແລ້ວ Chrome ບໍ່ສາມາດກວດລະຫັດຜ່ານຂອງທ່ານໄດ້ ເພາະວ່າທ່ານບໍ່ໄດ້ເຂົ້າສູ່ລະບົບ Google Chrome OS +ການປົກປ້ອງທີ່ປັບປຸງດີຂຶ້ນເຮັດໄດ້ຫຼາຍກວ່າໃນການບລັອກການຫຼອກເອົາຂໍ້ມູນ ແລະ ເມົາແວ Chrome - ການເຂົ້າສູ່ລະບົບເຄືອຂ່າຍ - ກຳລັງມີການດຳເນີນການອື່ນຢູ່ໃນ Google Chrome. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ. Chrome OS ບໍ່ສາມາດຊິງຄ໌ຂໍ້ມູນຂອງທ່ານໄດ້ ເນື່ອງຈາກການລົງຊື່ເຂົ້າ​ໃຊ້ຜິດພາດ. diff --git a/chrome/app/resources/google_chrome_strings_lt.xtb b/chrome/app/resources/google_chrome_strings_lt.xtb index 18565ce94d3508..7481f32988745e 100644 --- a/chrome/app/resources/google_chrome_strings_lt.xtb +++ b/chrome/app/resources/google_chrome_strings_lt.xtb @@ -61,6 +61,7 @@ Kai kurios funkcijos gali būti nepasiekiamos ir nuostatų pakeitimai nebus išs „Chrome“ reikia leidimo, kad galėtų naudoti fotoaparatą ir mikrofoną šioje svetainėje „Chrome“ negali patikrinti jūsų slaptažodžių. Vėliau bandykite dar kartą. Visus „Chrome“ duomenis, sugeneruotus naudojant šį profilį (pvz., sukurtas žymes, istoriją, slaptažodžius ir kitus nustatymus), gali pašalinti darbo profilio administratorius. +Tęskite „Google Chrome“ negali sinchronizuoti duomenų, nes jūsų domene sinchronizavimas nepasiekiamas. „Google Chrome“ nori eksportuoti jūsų slaptažodžius. Įveskite „Windows“ slaptažodį, kad tai leistumėte. Pašalinti @@ -145,6 +146,7 @@ Kai kurios funkcijos gali būti nepasiekiamos ir nuostatų pakeitimai nebus išs Plėtinys „“ pridėtas prie „Chrome“ „Chrome“ negali patikrinti jūsų slaptažodžių, nes esate neprisijungę „Google Chrome OS“ +Naudojant sustiprintą apsaugą pasitelkiama papildomų priemonių sukčiavimui ir kenkėjiškoms programoms užblokuoti „Chrome“ – prisijungimas prie tinklo – „ Vykdoma kita „Google Chrome“ operacija. Vėliau bandykite dar kartą. „Chrome“ OS negali sinchronizuoti duomenų, nes prisijungiant įvyko klaida. diff --git a/chrome/app/resources/google_chrome_strings_lv.xtb b/chrome/app/resources/google_chrome_strings_lv.xtb index f1f8751381b937..2dfa4d08187bea 100644 --- a/chrome/app/resources/google_chrome_strings_lv.xtb +++ b/chrome/app/resources/google_chrome_strings_lv.xtb @@ -58,6 +58,7 @@ Pārlūkam Chrome ir nepieciešama atļauja piekļūt jūsu kamerai un mikrofonam šajā vietnē. Pārlūkprogrammā Chrome nevar pārbaudīt jūsu paroles. Vēlāk mēģiniet vēlreiz. Darba profila administrators var noņemt šī profila lietošanas laikā ģenerētos Chrome datus (piemēram, grāmatzīmes, vēsturi, paroles un citus iestatījumus). +Turpināt Google Chrome nevarēja sinhronizēt jūsu datus, jo jūsu domēnam nav pieejama sinhronizācija. Pārlūkā Google Chrome tiek mēģināts eksportēt jūsu paroles. Lai to atļautu, ierakstiet savu Windows paroli. Atinstalēt @@ -142,6 +143,7 @@ Paplašinājums pievienots pārlūkam Chrome Pārlūkprogrammā Chrome nevar pārbaudīt jūsu paroles, jo jūs neesat pierakstījies. Google Chrome OS +Uzlabotā aizsardzība labāk bloķē pikšķerēšanas mēģinājumus un ļaunprātīgu programmatūru Chrome — pierakstīšanās vietnē — Tiek veikta cita darbība pārlūkā Google Chrome. Lūdzu, vēlāk mēģiniet vēlreiz. Chrome OS nevarēja sinhronizēt jūsu datus pierakstīšanās kļūdas dēļ. diff --git a/chrome/app/resources/google_chrome_strings_mk.xtb b/chrome/app/resources/google_chrome_strings_mk.xtb index 1bb5ebd3541f97..48b608a315d8f6 100644 --- a/chrome/app/resources/google_chrome_strings_mk.xtb +++ b/chrome/app/resources/google_chrome_strings_mk.xtb @@ -61,6 +61,7 @@ На Chrome му треба дозвола за да пристапи до камерата и микрофонот за сајтов Chrome не може да ги провери вашите лозинки. Обидете се пак подоцна. Податоците на Chrome што се генерирани при користењето на овој профил (како на пример, создавање обележувачи, историја, лозинки и други поставки) може да се отстранат од страна на администраторот на работниот профил. +Продолжи Google Chrome не може да ги синхронизира вашите податоци затоа што Sync не е достапен за вашиот домен. Google Chrome сака да ги извезе вашите лозинки. Внесете ја лозинката за Windows за да го дозволите ова. Деинсталирај @@ -145,6 +146,7 @@ е додадена на Chrome Chrome не може да ги провери вашите лозинки бидејќи не сте најавени Google Chrome OS +„Подобрената заштита“ помага при блокирање кражби на идентитетот и злонамерен софтвер Chrome - Мрежно најавување - Во тек е друга операција на Google Chrome. Обидете се повторно подоцна. Chrome OS не може да ги синхронизира вашите податоци поради грешка при пријавувањето. diff --git a/chrome/app/resources/google_chrome_strings_ml.xtb b/chrome/app/resources/google_chrome_strings_ml.xtb index 6ff064c6337e15..bec99c44ad8807 100644 --- a/chrome/app/resources/google_chrome_strings_ml.xtb +++ b/chrome/app/resources/google_chrome_strings_ml.xtb @@ -61,6 +61,7 @@ ഈ സൈറ്റിനായി, Chrome-ന് നിങ്ങളുടെ ക്യാമറയും മൈക്രോഫോണും ആക്‌സസ് ചെയ്യാനുള്ള അനുമതി ആവശ്യമാണ് Chrome-ന് നിങ്ങളുടെ പാസ്‌വേഡുകൾ പരിശോധിക്കാനാവുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. ഈ പ്രൊഫൈലിന്റെ ഉപയോഗത്തിനിടയിൽ ഉണ്ടായ ഏത് Chrome ഡാറ്റയും (ബുക്ക്‌മാർക്കുകൾ, ചരിത്രം, പാസ്‌വേഡുകൾ, മറ്റ് ക്രമീകരണം എന്നിവ സൃഷ്ടിക്കൽ പോലുള്ളവ) ഔദ്യോഗിക പ്രൊഫൈൽ അഡ്മിന് നീക്കം ചെയ്യാനാകും. +തുടരുക നിങ്ങളുടെ ഡൊമെയ്‌‌നിനായി സമന്വയം ലഭ്യമല്ലാത്തതിനാൽ Google Chrome-ന് നിങ്ങളുടെ ഡാറ്റ സമന്വയിപ്പിക്കാനായില്ല. നിങ്ങളുടെ പാസ്‌വേഡുകൾ എക്‌സ്‌പോർട്ട് ചെയ്യാൻ Google Chrome ആഗ്രഹിക്കുന്നു. ഇത് അനുവദിക്കാൻ നിങ്ങളുടെ Windows പാസ്‌വേഡ് നൽകുക. അണ്‍‌ഇന്‍‌സ്റ്റാള്‍‌ ചെയ്യുക @@ -145,6 +146,7 @@ Chrome-ലേക്ക് ചേർത്തു നിങ്ങൾ സൈൻ ഇൻ ചെയ്‌തിട്ടില്ലാത്തതിനാൽ Chrome-ന് നിങ്ങളുടെ പാസ്‌വേഡുകൾ പരിശോധിക്കാനാവില്ല Google Chrome OS +ഫിഷിംഗും മാല്‍വെയറും ബ്ലോക്ക് ചെയ്യുന്നതിന് മെച്ചപ്പെടുത്തിയ പരിരക്ഷ കൂടുതൽ കാര്യങ്ങൾ ചെയ്യുന്നു Chrome - നെറ്റ്‌വർക്ക് സൈൻ ഇൻ - Google Chrome-ലെ മറ്റൊരു പ്രവർത്തനം പുരോഗതിയിലാണ്. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. സൈൻ ഇൻ ചെയ്യുന്നതിലെ പിശക് കാരണം Chrome OS-ന് നിങ്ങളുടെ ഡാറ്റ സമന്വയിപ്പിക്കാനായില്ല. diff --git a/chrome/app/resources/google_chrome_strings_mn.xtb b/chrome/app/resources/google_chrome_strings_mn.xtb index 329f2aad349a0c..62b2080665c03f 100644 --- a/chrome/app/resources/google_chrome_strings_mn.xtb +++ b/chrome/app/resources/google_chrome_strings_mn.xtb @@ -61,6 +61,7 @@ Энэ сайтыг ашиглахын тулд Chrome-д таны камер, микрофонд хандах зөвшөөрөл шаардлагатай Chrome таны нууц үгсийг шалгах боломжгүй байна. Дараа дахин оролдоно уу. Энэ профайлыг ашиглах үед үүссэн Chrome-н аливаа өгөгдлийг (хавчуурга, түүх, нууц үг болон бусад тохиргоог үүсгэх зэрэг) ажлын профайлын админ хасах боломжтой. +Цааш Таны домэйнд sync хийх боломжгүй учраас Google Chrome нь таны өгөгдлийг sync хийж чадсангүй. Google Chrome таны нууц үгийг экспортлох хүсэлтэй байна. Үүнийг зөвшөөрч байгаа бол Windows-н нууц үгээ оруулна уу. Устгах @@ -145,6 +146,7 @@ -г Chrome-д нэмсэн Та нэвтрээгүй байгаа тул Chrome таны нууц үгсийг шалгах боломжгүй байна Google Chrome OS +Сайжруулсан хамгаалалт нь фишинг болон хортой кодыг блоклохын тулд илүү ихийг хийдэг Chrome - Сүлжээнд нэвтрэх - Google Chrome-н өөр үйл ажиллагаа явагдаж байна. Дараа дахин оролдоно уу. Таныг нэвтрэхэд алдаа гарсны улмаас Chrome-ийн үйлдлийн систем таны датаг синхрончлох боломжгүй байна. @@ -248,6 +250,7 @@ Google Chrome таны тохируулгыг дахин сэргээх боло Та нэрээр Chrome-д нэвтэрсэн байна. Та дараа дахин нэвтрэхдээ ижил хаяг ашиглан нэвтэрнэ үү. Chrome OS-ийн нөхцлүүд Таны домэйн дээр мэдээллийн тохиргоог хийх боломжгүй байгаа тул Chrome OS нь таны мэдээллийн тохиргоог хийх боломжгүй байна. +Chrome-н хамгийн хүчирхэг аюулгүй байдлыг аваарай Chrome хаяг оруулах хэсэгт зөвлөмж харуулахын тулд таны Драйвт хандах болно Google Chrome Dev Таны төхөөрөмж шинэчлэгдсэн эсэхийг харахын тулд Chrome үйлдлийн системийн тохиргоо руу очно уу @@ -290,6 +293,7 @@ Google Chrome таны тохируулгыг дахин сэргээх боло Google Chrome Энэ ажлын профайл нь таны хувийн профайлаас бүрэн тусдаа байна. Google Chrome-ийн шинэ хувилбар боломжтой байгаа бөгөөд энэ нь урьд урьдныхаас ч илүү хурдан. +Мөн Chrome-д асаах уу? Chrome-н профайлуудаар та Chrome-н бүх зүйлээ тусгаарлах боломжтой. Энэ нь ажил болон зугаацдаг зүйлсээ тусад нь байлгахад илүү хялбар болгоно. Google Chrome ажиллахгүй байна. Дахин эхүүлэх үү? Орчин тойрны тань 3D газрын зургийг үүсгэхийн тулд таны камерт хандах зөвшөөрөл Chrome-д шаардлагатай @@ -306,6 +310,7 @@ Google Chrome таны тохируулгыг дахин сэргээх боло Танд системийн түвшинд суулгах зохих эрх байхгүй байна. Суулгагчийг админы хувиар дахин ажиллуулахыг оролдож үзнэ үү. Chrome-г дахин эхлүүлэх -с Android утсандаа дугаар илгээхийн тулд хоёр төхөөрөмжийнхөө аль алинаас нь Chrome-д нэвтэрнэ үү. +Chrome-н хамгийн чухал гэж үздэг нууцлалын сонголтуудыг өөрчилнө үү. Энэ хөтчид бүх тохиргоо болон сонголт багтаагүй. Та энэ хөтчид ажлын профайл нэмж байгаа бөгөөд администратордоо зөвхөн ажлын профайлын хяналтыг өгч байна. {0,plural, =0{Chrome-н шинэчлэлт боломжтой байна}=1{Chrome-н шинэчлэлт боломжтой байна}other{Chromium-н шинэчлэлт # хоногийн турш боломжтой байсаар байна}} Таны бүртгэлийн мэдээлэл хуучирсан учраас Chrome OS нь таны өгөгдлийг sync хийж чадсангүй. diff --git a/chrome/app/resources/google_chrome_strings_mr.xtb b/chrome/app/resources/google_chrome_strings_mr.xtb index f56c4dffce91df..263d9a691a683d 100644 --- a/chrome/app/resources/google_chrome_strings_mr.xtb +++ b/chrome/app/resources/google_chrome_strings_mr.xtb @@ -60,6 +60,7 @@ या साइटसाठी Chrome ला तुमचा कॅमेरा आणि मायक्रोफोन ॲक्सेस करण्याची परवानगी हवी आहे Chrome तुमचे पासवर्ड तपासू शकत नाही. नंतर पुन्हा प्रयत्न करा. या प्रोफाइलच्या वापरादरम्यान जनरेट केला गेलेला कोणताही Chrome डेटा (जसे की बुकमार्क, इतिहास, पासवर्ड आणि इतर सेटिंग्जची निर्मिती) कार्य प्रोफाइल अ‍ॅडमिनिस्ट्रेटरला हटवता येतो. +सुरू ठेवा आपल्या डोमेनसाठी सिंक उपलब्ध नसल्यामुळे Google Chrome तुमचा डेटा संकालित करू शकले नाही. Google Chrome ला तुमचे पासवर्ड निर्यात करायचे आहेत. हे करू देण्यासाठी तुमचा Windows पासवर्ड टाइप करा. अनइंस्टॉल करा @@ -144,6 +145,7 @@ हे Chrome मध्‍ये जोडले गेले आहे तुम्ही साइन इन केलेले नसल्यामुळे Chrome तुमचे पासवर्ड तपासू शकत नाही Google Chrome OS +वर्धित सुरक्षितता फिशिंग आणि मालवेअर अधिक चांगल्यारितीने ब्लॉक करते Chrome - नेटवर्क साइन इन - Google Chrome वर दुसरे ऑपरेशन प्रगतीपथावर आहे. कृपया नंतर पुन्हा प्रयत्न करा. साइन इन करण्यात एररमुळे Chrome OS तुमचा डेटा सिंक करू शकले नाही. diff --git a/chrome/app/resources/google_chrome_strings_ms.xtb b/chrome/app/resources/google_chrome_strings_ms.xtb index 3fee12009fad21..a6a08776588f82 100644 --- a/chrome/app/resources/google_chrome_strings_ms.xtb +++ b/chrome/app/resources/google_chrome_strings_ms.xtb @@ -57,6 +57,7 @@ Chrome memerlukan kebenaran untuk mengakses kamera dan mikrofon anda bagi tapak ini Chrome tidak dapat menyemak kata laluan anda. Cuba lagi nanti. Sebarang data Chrome yang dijana semasa penggunaan profil ini (seperti pembuatan penanda halaman, sejarah, kata laluan dan tetapan lain) boleh dialih keluar oleh pentadbir profil kerja. +Teruskan Google Chrome tidak dapat menyegerakkan data anda kerana Segerak tidak tersedia untuk domain anda. Google Chrome mahu mengeksport kata laluan anda. Taip kata laluan Windows anda untuk membenarkannya. Nyahpasang @@ -141,6 +142,7 @@ telah ditambahkan pada Chrome Chrome tidak dapat menyemak kata laluan anda kerana anda tidak log masuk OS Google Chrome +Perlindungan yang dipertingkatkan melakukan pelbagai lagi perkara untuk menyekat pancingan data dan perisian hasad Chrome - Log Masuk Rangkaian - Terdapat operasi lain sedang dijalankan pada Google Chrome. Sila cuba sebentar lagi. OS Chrome tidak dapat menyegerakkan data anda disebabkan oleh ralat melog masuk. diff --git a/chrome/app/resources/google_chrome_strings_my.xtb b/chrome/app/resources/google_chrome_strings_my.xtb index 5b69e602ab791b..ac642330ef5edc 100644 --- a/chrome/app/resources/google_chrome_strings_my.xtb +++ b/chrome/app/resources/google_chrome_strings_my.xtb @@ -61,6 +61,7 @@ ဤဝဘ်ဆိုက်အတွက် Chrome သည် သင်၏ကင်မရာနှင့် မိုက်ခရိုဖုန်းကို အသုံးပြုခွင့်ရရန် လိုအပ်ပါသည် Chrome က သင့်စကားဝှက်များကို စစ်ဆေး၍မရပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။ ဤပရိုဖိုင်အသုံးပြုစဉ်အတွင်း ရရှိလာသော Chrome ဒေတာမှန်သမျှ (လိပ်စာများ၊ မှတ်တမ်း၊ စကားဝှက်နှင့် အခြားဆက်တင်များပြုလုပ်ခြင်း ကဲ့သို့) ကို အလုပ်ပရိုဖိုင် စီမံခန့်ခွဲသူက ဖယ်ရှားနိုင်သည်။ +ဆက်လုပ်ရန် သင်၏ ဒိုမိန်းအတွက် စင့်က် လုပ်မရနိုင်သောကြောင့် Google Chrome က သင်၏ ဒေတာကို စင့်က် မလုပ်နိုင်ခဲ့ပါ။ Google Chrome သည် သင်၏ စကားဝှက်များကို တင်ပို့လိုသည်။ ၎င်းကို ခွင့်ပြုရန် သင်၏ Windows စကားဝှက်ကို ထည့်ပါ။ ဖြုတ်ရန် @@ -145,6 +146,7 @@ ကို Chrome သို့ပေါင်းထည့်ပြီးပါပြီ လက်မှတ်ထိုးဝင်မထားသဖြင့် Chrome က သင့်စကားဝှက်များကို စစ်ဆေး၍မရပါ Google Chrome OS +အဆင့်မြှင့်တင်ထားသော ကာကွယ်မှုက ဖြားယောင်းမှုနှင့် မဲလ်ဝဲများကို ပိုမိုပိတ်ဆို့ပေးသည် Chrome - ကွန်ရက် လက်မှတ်ထိုးဝင်ခြင်း - Google Chrome ရှိ အခြားလုပ်ဆောင်ချက်မှာ မပြီးပြတ်သေးပါ။ ခဏကြာမှ ထပ်လုပ်ကြည့်ပါ။ လက်မှတ်ထိုး ဝင်စဉ် အမှား တစ်ခုကြောင့် Chrome OS သည် သင်၏ ဒေတာကို စင့်က် လုပ်မပေးနိုင်ပါ။ diff --git a/chrome/app/resources/google_chrome_strings_ne.xtb b/chrome/app/resources/google_chrome_strings_ne.xtb index 5130d259319621..5452d663c57b2b 100644 --- a/chrome/app/resources/google_chrome_strings_ne.xtb +++ b/chrome/app/resources/google_chrome_strings_ne.xtb @@ -59,6 +59,7 @@ Chrome लाई यो साइटका लागि तपाईंको क्यामेरा र माइक्रोफोनमाथि पहुँच राख्ने अनुमति चाहिन्छ Chrome ले तपाईंका पासवर्डहरूको जाँच गर्न सकेन। पछि फेरि प्रयास गर्नुहोस्। कार्य प्रोफाइलका एड्मिन यो प्रोफाइल चलाउँदा Chrome मा सिर्जना हुने (बुकमार्क, इतिहास, पासवर्ड र अन्य सेटिङलगायतका) सबै डेटा हटाउन सक्नुहुन्छ। +जारी राख्नुहोस् Google Chrome ले तपाइँको लगत समक्रमण गर्न सकेन किनभने तपाइँको डोमेनको लागि समक्रमन उपलब्ध छैन। Google Chrome तपाईंका पासवर्डहरू निर्यात गर्न चाहन्छ। यसो गर्ने अनुमति दिन Windows को आफ्नो पासवर्ड टाइप गर्नुहोस्‌। विस्थापन गर्नुहोस् @@ -143,6 +144,7 @@ लाई Chrome मा थपिएको छ तपाईं साइन इन नहुनुभएकाले Chrome ले तपाईंका पासवर्डहरूको जाँच गर्न सकेन Google Chrome OS +परिष्कृत सुरक्षा प्रयोग गरी फिसिङ तथा मालवेयरमाथि अझ राम्रोसँग रोक लगाउन सकिन्छ Chrome - नेटवर्क साइन इन - Google Chrome मा अर्को कारबाही जारी छ। कृपया पछि फेरि प्रयास गर्नुहोस्। साइन इन त्रुटि भएको कारण Chrome OS ले तपाईंको डाटा समक्रमण गर्न सकेन। diff --git a/chrome/app/resources/google_chrome_strings_nl.xtb b/chrome/app/resources/google_chrome_strings_nl.xtb index de335a05ba1aa4..b8a9aba8d215b1 100644 --- a/chrome/app/resources/google_chrome_strings_nl.xtb +++ b/chrome/app/resources/google_chrome_strings_nl.xtb @@ -60,6 +60,7 @@ Sommige functies zijn wellicht niet beschikbaar en wijzigingen in voorkeuren wor Chrome heeft toegangsrechten voor je camera en microfoon nodig voor deze site Chrome kan je wachtwoorden niet checken. Probeer het later opnieuw. Alle Chrome-gegevens die worden gegenereerd bij het gebruik van dit profiel (zoals bookmarks, geschiedenis, wachtwoorden en andere instellingen) kunnen worden verwijderd door de beheerder van het werkprofiel. +Doorgaan Google Chrome kan je gegevens niet synchroniseren, omdat synchronisatie niet beschikbaar is voor je domein. Google Chrome wil je wachtwoorden exporteren. Geef je Windows-wachtwoord op om dit toe te staan. Installatie ongedaan maken @@ -144,6 +145,7 @@ Sommige functies zijn wellicht niet beschikbaar en wijzigingen in voorkeuren wor is toegevoegd aan Chrome Chrome kan je wachtwoorden niet checken omdat je niet bent ingelogd. Google Chrome OS +Geoptimaliseerde beveiliging die je nog beter beschermt tegen phishing en malware Chrome - Inloggen op netwerk - Er wordt een andere bewerking in Google Chrome uitgevoerd. Probeer het later opnieuw. Chrome OS kan je gegevens niet synchroniseren door een fout tijdens het inloggen. diff --git a/chrome/app/resources/google_chrome_strings_no.xtb b/chrome/app/resources/google_chrome_strings_no.xtb index 16543cd2b9ba8c..4193c69482fdf7 100644 --- a/chrome/app/resources/google_chrome_strings_no.xtb +++ b/chrome/app/resources/google_chrome_strings_no.xtb @@ -56,6 +56,7 @@ Chrome trenger tilgang til kameraet ditt og mikrofonen din for dette nettstedet Chrome kan ikke sjekke passordene dine. Prøv igjen senere. Alle Chrome-data som genereres mens denne profilen brukes (f.eks. oppretting av bokmerker, logg, passord og andre innstillinger), kan fjernes av administratoren for jobbprofilen. +Fortsett Google Chrome kunne ikke synkronisere dataene dine fordi synkronisering ikke er tilgjengelig for domenet ditt. Google Chrome forsøker å eksportere passordene dine. Skriv inn Windows-passordet ditt for å tillate dette. Avinstaller @@ -140,6 +141,7 @@ er lagt til i Chrome Chrome kan ikke sjekke passordene dine, siden du ikke er logget på Google Chromes operativsystem +Økt beskyttelse gjør mer for å blokkere nettfisking og skadelig programvare Chrome – nettverkspålogging – En annen handling er i gang på Google Chrome. Prøv på nytt senere. Chrome OS kunne ikke synkronisere dataene dine på grunn av en feil under pålogging. diff --git a/chrome/app/resources/google_chrome_strings_or.xtb b/chrome/app/resources/google_chrome_strings_or.xtb index de3e9bd7830a99..97f38cdc72e7f4 100644 --- a/chrome/app/resources/google_chrome_strings_or.xtb +++ b/chrome/app/resources/google_chrome_strings_or.xtb @@ -61,6 +61,7 @@ ଏହି ସାଇଟ୍ ପାଇଁ ଆପଣଙ୍କର କ୍ୟାମେରା ଏବଂ ମାଇକ୍ରୋଫୋନ୍ ଆକ୍ସେସ୍ କରିବାକୁ Chrome ଅନୁମତି ଆବଶ୍ୟକ କରୁଛି Chrome ଆପଣଙ୍କର ପାସୱାର୍ଡଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ଏହି ପ୍ରୋଫାଇଲର ବ୍ୟବହାର ସମୟରେ ସୃଷ୍ଟି ହୋଇଥିବା ଯେ କୌଣସି Chrome ଡାଟା (ଯେପରି ବୁକମାର୍କ୍, ଇତିହାସ, ପାସୱାର୍ଡ ଏବଂ ଅନ୍ୟ ସେଟିଂସର କ୍ରିଏସନ୍) ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ଆଡମିନିଷ୍ଟ୍ରେଟରଙ୍କ ଦ୍ୱାରା କାଢ଼ି ଦିଆଯାଇପାରିବ। +ଜାରି ରଖନ୍ତୁ ଆପଣଙ୍କର ଡୋମେନ୍ ପାଇଁ ସିଙ୍କ୍ ଉପଲବ୍ଧ ନଥିବାରୁ Google Chrome ଆପଣଙ୍କର ଡାଟା ସିଙ୍କ୍ କରିପାରିଲା ନାହିଁ। Google Chrome ଆପଣଙ୍କର ପାସ୍‌ୱାର୍ଡଗୁଡିକୁ ଏକ୍ସପୋର୍ଟ କରିବାକୁ ଚାହେଁ। ଏହାକୁ ଅନୁମତି ଦେବା ପାଇଁ ନିଜର Windows ପାସ୍‌ୱାର୍ଡ ଟାଇପ୍ କରନ୍ତୁ। ଅନ୍‍ଇନ୍‍ଷ୍ଟଲ୍‌ କରନ୍ତୁ @@ -145,6 +146,7 @@ Chromeରେ ଯୋଗକରାଯାଇଛି ଆପଣ ସାଇନ୍ ଇନ୍ କରିନଥିବା ଯୋଗୁଁ Chrome ଆପଣଙ୍କ ପାସୱାର୍ଡଗୁଡ଼ିକ ଯାଞ୍ଚ କରିପାରିବ ନାହିଁ Google Chrome OS +ଉନ୍ନତ ସୁରକ୍ଷା ଫିସିଂ ଓ ମାଲୱେୟାରକୁ ବ୍ଲକ୍ କରିବାକୁ ଅନେକ କିଛି କରେ Chrome - ନେଟୱାର୍କ ସାଇନ୍-ଇନ୍ - Google Chromeରେ ଅନ୍ୟ ଏକ କାର୍ଯ୍ୟ ପ୍ରକ୍ରିୟାରତ ଅଛି। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ସାଇନ୍ ଇନ୍ କରିବାରେ ଏକ ତ୍ରୁଟି ଯୋଗୁଁ Chrome OS ଆପଣଙ୍କର ଡାଟାକୁ ସିଙ୍କ୍ କରିପାରିଲା ନାହିଁ। diff --git a/chrome/app/resources/google_chrome_strings_pa.xtb b/chrome/app/resources/google_chrome_strings_pa.xtb index d00f173764a3a2..9f1213732ce028 100644 --- a/chrome/app/resources/google_chrome_strings_pa.xtb +++ b/chrome/app/resources/google_chrome_strings_pa.xtb @@ -61,6 +61,7 @@ Chrome ਨੂੰ ਇਸ ਸਾਈਟ ਵਾਸਤੇ ਤੁਹਾਡੇ ਕੈਮਰੇ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ Chrome ਤੁਹਾਡੇ ਪਾਸਵਰਡਾਂ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਇਸ ਪ੍ਰੋਫਾਈਲ ਦੀ ਵਰਤੋਂ ਦੇ ਦੌਰਾਨ ਤਿਆਰ ਕੀਤਾ ਕੋਈ ਵੀ Chrome ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਬੁੱਕਮਾਰਕ, ਇਤਿਹਾਸ, ਪਾਸਵਰਡ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਦੀ ਰਚਨਾ) ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਹਟਾਇਆ ਜਾ ਸਕਦਾ ਹੈ। +ਜਾਰੀ ਰੱਖੋ Google Chrome ਤੁਹਾਡਾ ਡਾਟਾ ਸਮਕਾਲੀਕਰਨ ਨਹੀਂ ਕਰ ਸਕਿਆ ਕਿਉਂਕਿ ਸਮਕਾਲੀਕਰਨ ਤੁਹਾਡੀ ਡੋਮੇਨ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। Google Chrome ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਨਿਰਯਾਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ। ਇਹ ਕਰਨ ਦੇਣ ਲਈ ਆਪਣਾ Windows ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ। ਅਣਸਥਾਪਤ ਕਰੋ @@ -145,6 +146,7 @@ ਨੂੰ Chrome ਵਿੱਚ ਸ਼ਾਮਲ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ Chrome ਤੁਹਾਡੇ ਪਾਸਵਰਡਾਂ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਤੁਸੀਂ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਹੈ Google Chrome OS +ਧੋਖਾਧੜੀ ਅਤੇ ਮਾਲਵੇਅਰ ਨੂੰ ਬਲਾਕ ਕਰਨ ਵਾਸਤੇ ਵਿਸਤ੍ਰਿਤ ਸੁਰੱਖਿਆ ਹੋਰ ਵੱਧ ਕੰਮ ਕਰਦੀ ਹੈ Chrome - ਨੈੱਟਵਰਕ ਸਾਈਨ-ਇਨ - Google Chrome 'ਤੇ ਕੋਈ ਹੋਰ ਚੱਲ ਰਹੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। Chrome OS ਸਾਈਨ-ਇਨ ਕਰਨ ਵੇਲੇ ਇੱਕ ਗੜਬੜ ਹੋਣ ਕਾਰਨ ਤੁਹਾਡਾ ਡਾਟਾ ਸਿੰਕ ਨਹੀਂ ਹੋ ਸਕਿਆ। diff --git a/chrome/app/resources/google_chrome_strings_pl.xtb b/chrome/app/resources/google_chrome_strings_pl.xtb index f826775c99eae1..96f48f809939e7 100644 --- a/chrome/app/resources/google_chrome_strings_pl.xtb +++ b/chrome/app/resources/google_chrome_strings_pl.xtb @@ -56,6 +56,7 @@ Chrome potrzebuje uprawnień dostępu do aparatu i mikrofonu na tej stronie Chrome nie może sprawdzić Twoich haseł. Spróbuj później. Wszystkie dane Chrome wygenerowane podczas używania tego profilu (takie jak zakładki, historia, hasła i inne ustawienia) mogą zostać usunięte przez administratora profilu służbowego. +Dalej Google Chrome nie może zsynchronizować danych, ponieważ synchronizacja jest niedostępna w Twojej domenie. Google Chrome chce wyeksportować Twoje hasła. Wpisz swoje hasło do Windows, by na to zezwolić. Odinstaluj @@ -140,6 +141,7 @@ Rozszerzenie zostało dodane do Chrome Chrome nie może sprawdzić haseł, jeśli się nie zalogujesz System operacyjny Google Chrome +Silniejsza ochrona lepiej chroni przed phishingiem i złośliwym oprogramowaniem Chrome – logowanie do sieci – Google Chrome wykonuje teraz inną operację. Spróbuj ponownie później. System operacyjny Chrome nie może zsynchronizować danych z powodu błędu logowania. diff --git a/chrome/app/resources/google_chrome_strings_pt-BR.xtb b/chrome/app/resources/google_chrome_strings_pt-BR.xtb index 87128718bcf29e..0af740d1306e15 100644 --- a/chrome/app/resources/google_chrome_strings_pt-BR.xtb +++ b/chrome/app/resources/google_chrome_strings_pt-BR.xtb @@ -57,6 +57,7 @@ O Chrome precisa de permissão para este site acessar sua câmera e seu microfone O Chrome não pode verificar suas senhas. Tente mais tarde. Quaisquer dados do Chrome gerados quando este perfil estiver sendo usado (como a criação de favoritos, histórico, senhas e outras configurações) podem ser removidos pelo administrador do perfil de trabalho. +Continuar O Google Chrome não pôde sincronizar seus dados porque a sincronização não está disponível para seu domínio. O Google Chrome quer exportar suas senhas. Digite sua senha do Windows para permitir isso. Desinstalar @@ -141,6 +142,7 @@ A extensão foi adicionada ao Chrome O Chrome não pode verificar suas senhas porque sua conta não está conectada Sistema operacional (OS) do Google Chrome +A Proteção reforçada é mais eficiente no combate a golpes de phishing e malware Chrome - Login na rede - Outra operação está em andamento no Google Chrome. Tente novamente mais tarde. O Chrome OS não pôde sincronizar seus dados devido a um erro durante o login. diff --git a/chrome/app/resources/google_chrome_strings_pt-PT.xtb b/chrome/app/resources/google_chrome_strings_pt-PT.xtb index 2aaa41213c4f9b..7eefef0431113a 100644 --- a/chrome/app/resources/google_chrome_strings_pt-PT.xtb +++ b/chrome/app/resources/google_chrome_strings_pt-PT.xtb @@ -57,6 +57,7 @@ a sincronização. O Chrome necessita de autorização de acesso à câmara e ao microfone para este site. O Chrome não consegue verificar as suas palavras-passe. Tente novamente mais tarde. Os dados do Chromium gerados durante a utilização deste perfil (como a criação de marcadores, histórico, palavras-passe e outras definições) podem ser removidos pelo administrador do perfil de trabalho. +Continuar O Google Chrome não conseguiu sincronizar os dados porque a Sincronização não está disponível para o seu domínio. O Google Chrome pretende exportar as suas palavras-passe. Escreva a sua palavra-passe do Windows para permitir esta ação. Desinstalar @@ -141,6 +142,7 @@ a sincronização. A extensão foi adicionada ao Chrome O Chrome não consegue verificar as suas palavras-passe porque não tem sessão iniciada. SO do Google Chrome +A proteção melhorada vai mais além para bloquear o phishing e o software malicioso. Chrome – Início de sessão na rede – Está em curso outra operação no Google Chrome. Tente novamente mais tarde. O Chrome OS não conseguiu sincronizar os dados devido a um erro no início de sessão. diff --git a/chrome/app/resources/google_chrome_strings_ro.xtb b/chrome/app/resources/google_chrome_strings_ro.xtb index 51ddd65e55e5b7..f653ae6a0b0556 100644 --- a/chrome/app/resources/google_chrome_strings_ro.xtb +++ b/chrome/app/resources/google_chrome_strings_ro.xtb @@ -56,6 +56,7 @@ Chrome are nevoie de permisiune ca să acceseze camera foto și microfonul pentru acest site Chrome nu îți poate verifica parolele. Încearcă din nou mai târziu. Toate datele Chrome generate în timpul folosirii acestui profil (precum marcajele create, istoricul, parolele și alte setări) pot fi eliminate de administratorul profilului de serviciu. +Continuă Google Chrome nu a putut sincroniza datele, deoarece sincronizarea nu este disponibilă pentru domeniul dvs. Google Chrome vrea să îți exporte parolele. Pentru a permite asta, introdu parola pentru Windows. Dezinstalează @@ -140,6 +141,7 @@ Extensia a fost adăugată la Chrome Chrome nu îți poate verifica parolele, deoarece nu te-ai conectat Sistemul de operare Google Chrome +Protecția îmbunătățită face mai multe pentru blocarea phishingului și a programelor malware Chrome – conectare la rețea – O altă operație din Google Chrome este în curs de desfășurare. Încearcă din nou mai târziu. Sistemul de operare Chrome nu a putut sincroniza datele din cauza unei erori la conectare. diff --git a/chrome/app/resources/google_chrome_strings_ru.xtb b/chrome/app/resources/google_chrome_strings_ru.xtb index 879438d498b4ea..3643e8d5015ee7 100644 --- a/chrome/app/resources/google_chrome_strings_ru.xtb +++ b/chrome/app/resources/google_chrome_strings_ru.xtb @@ -56,6 +56,7 @@ Для этого сайта Chrome запрашивает доступ к камере и микрофону. Не удается запустить проверку паролей в Chrome. Повторите попытку позже. Администратор рабочего профиля может удалять любые данные, сохраненные в браузере Chrome при использовании этого профиля (например, добавленные закладки, историю, пароли и настройки). +Продолжить Google Chrome не удалось синхронизировать данные, поскольку служба Sync недоступна для вашего домена. Чтобы экспортировать пароли из Google Chrome, введите пароль своего аккаунта Windows. Удалить @@ -140,6 +141,7 @@ Расширение "" установлено Не удается запустить проверку паролей в Chrome, поскольку вы не вошли в аккаунт. Google Chrome OS +В режиме "Улучшенная защита" фишинговые атаки и вредоносное ПО блокируются ещё эффективнее. Chrome – вход в сеть – "" Google Chrome выполняет другую операцию. Повторите попытку позже. Не удалось синхронизировать данные из-за ошибки входа в аккаунт. diff --git a/chrome/app/resources/google_chrome_strings_si.xtb b/chrome/app/resources/google_chrome_strings_si.xtb index 165c194b01e535..557d2929055c5c 100644 --- a/chrome/app/resources/google_chrome_strings_si.xtb +++ b/chrome/app/resources/google_chrome_strings_si.xtb @@ -60,6 +60,7 @@ Chrome හට මෙම අඩවිය සදහා ඔබේ කැමරාවට සහ මයික්‍රෆෝනයට ප්‍රවේශ වීමට අවසර අවශ්‍යයි Chrome හට ඔබේ මුරපද පරීක්‍ෂා කළ නොහැක. පසුව නැවත උත්සාහ කරන්න. මෙම පැතිකඩ භාවිතා කරන විට ජනනය කරන කිනම් හෝ Chrome දත්ත (පිටුසන්, ඉතිහාසය, මුරපද සහ වෙනත් සැකසීම් වැනි) කාර්යාල පැතිකඩ පරිපාලක විසින් ඉවත් කළ හැකිය. +කරගෙන යන්න ඔබේ වසම සඳහා සම්මුහු නොපවතින බැවින් Google Chrome හට ඔබේ දත්ත සම්මුහු කළ නොහැකි විය. Google Chrome හට ඔබගේ මුරපද නිර්යාත කිරීමට අවශ්‍යය. මේ සඳහා අවසර දීමට ඔබගේ Windows මුරපදය ටයිප් කරන්න. අස්ථාපනය @@ -144,6 +145,7 @@ Chrome වෙත එක් කර ඇත ඔබ පුරනය වී නැති බැවින් Chrome හට ඔබේ මුරපද පරීක්‍ෂා කළ නොහැක Google Chrome OS +තතුබෑම් සහ අනිෂ්ට මෘදුකාංග අවහිර කිරීමට වැඩි දියුණු කළ ආරක්ෂාව වැඩි දෙයක් කරයි Chrome - ජාල පුරනය - Google Chrome මත තවත් මෙහෙයුමක් ක්‍රියාත්මක වෙමින් පවතී. පසුව නැවත උත්සාහ කරන්න. පිවිසුම් දෝශයක් හේතුවෙන් Chrome OS හට ඔබේ දත්ත සම්මුහු කළ නොහැක. diff --git a/chrome/app/resources/google_chrome_strings_sk.xtb b/chrome/app/resources/google_chrome_strings_sk.xtb index 8b660a6d1e3c47..faf292fa8683d9 100644 --- a/chrome/app/resources/google_chrome_strings_sk.xtb +++ b/chrome/app/resources/google_chrome_strings_sk.xtb @@ -59,6 +59,7 @@ Niektoré funkcie nemusia byť k dispozícii a zmeny vykonané v predvoľbách s Chrome potrebuje povolenie pre tento web na prístup k fotoaparátu a mikrofónu Chrome nemôže skontrolovať heslá. Skúste to neskôr. Všetky údaje prehliadača Chrome vygenerované počas používania tohto profilu (napríklad vytvorenie záložiek, histórie, hesiel a ďalších nastavení) môžu byť odstránené správcom pracovného profilu. +Pokračovať Prehliadaču Google Chrome sa nepodarilo synchronizovať vaše údaje, pretože možnosť synchronizácie nie je pre vašu doménu k dispozícii. Google Chrome sa pokúša exportovať vaše heslá. Ak to chcete povoliť, zadajte heslo systému Windows. Odinštalovať @@ -143,6 +144,7 @@ Niektoré funkcie nemusia byť k dispozícii a zmeny vykonané v predvoľbách s Rozšírenie bolo pridané do Chromu Chrome nemôže skontrolovať heslá, pretože ste sa neprihlásili Google Chrome OS +Rozšírená ochrana efektívnejšie blokuje phishing aj malvér Chrome – prihlásenie do siete – V prehliadači Google Chrome práve prebieha ďalšia operácia. Skúste to neskôr. Systému OS Chrome sa nepodarilo synchronizovať vaše údaje, pretože sa pri prihlasovaní vyskytla chyba. diff --git a/chrome/app/resources/google_chrome_strings_sl.xtb b/chrome/app/resources/google_chrome_strings_sl.xtb index 07bb09ff0f29a4..a9ef4a3431ddea 100644 --- a/chrome/app/resources/google_chrome_strings_sl.xtb +++ b/chrome/app/resources/google_chrome_strings_sl.xtb @@ -61,6 +61,7 @@ Nekatere funkcije morda niso na voljo in spremembe nastavitev ne bodo shranjene. Chrome potrebuje dovoljenje za dostop do fotoaparata in mikrofona za to spletno mesto Chrome ne more preveriti vaših gesel. Poskusite pozneje. Podatke v Chromu, ki se ustvarijo med uporabo tega profila (na primer zaznamke, zgodovino, gesla in druge nastavitve), lahko odstrani skrbnik delovnega profila. +Naprej Google Chrome ni mogel sinhronizirati podatkov, ker sinhronizacija ni na voljo za vašo domeno. Google Chrome želi izvoziti gesla. Če želite omogočiti to, vnesite geslo za Windows. Odmeščanje @@ -145,6 +146,7 @@ Nekatere funkcije morda niso na voljo in spremembe nastavitev ne bodo shranjene. Razširitev je dodana v Chrome Chrome ne more preveriti gesel, ker niste prijavljeni Google Chrome OS +Izboljšana zaščita učinkoviteje blokira lažno predstavljanje in zlonamerno programsko opremo. Chrome – Prijava v omrežje – Poteka druga operacija v Google Chromu. Poskusite znova pozneje. Chrome OS ni mogel sinhronizirati podatkov zaradi napake pri prijavi. diff --git a/chrome/app/resources/google_chrome_strings_sq.xtb b/chrome/app/resources/google_chrome_strings_sq.xtb index c4d750e9c82536..de6e8354c74b83 100644 --- a/chrome/app/resources/google_chrome_strings_sq.xtb +++ b/chrome/app/resources/google_chrome_strings_sq.xtb @@ -60,6 +60,7 @@ Disa funksione mund të mos ofrohen dhe ndryshimet në preferenca nuk do të ruh Chrome ka nevojë për leje për t'u qasur te kamera dhe mikrofoni yt për këtë sajt Chrome nuk mund t'i kontrollojë fjalëkalimet e tua. Provo përsëri më vonë. Çdo e dhënë e Chrome që krijohet gjatë përdorimit të këtij profili (si p.sh. krijimi i faqeshënuesve, historikut, fjalëkalimeve dhe cilësimeve të tjera) mund të hiqet nga administratori i profilit të punës. +Vazhdo Google Chrome nuk mund t'i sinkronizonte të dhënat për shkak se sinkronizimi nuk ofrohet për domenin tënd. Google Chrome dëshiron të eksportojë fjalëkalimet e tua. Shkruaj fjalëkalimin tënd të Windows për ta lejuar këtë. Çinstalo @@ -144,6 +145,7 @@ Disa funksione mund të mos ofrohen dhe ndryshimet në preferenca nuk do të ruh është shtuar te Chrome Chrome nuk mund t'i kontrollojë fjalëkalimet e tua sepse nuk je identifikuar Sistemi operativ Google Chrome +Mbrojtja e përmirësuar bën edhe më shumë për bllokimin e mashtrimeve dhe softuerëve keqdashës Chrome - identifikimi në rrjet - Një veprim tjetër në Google Chrome është në vazhdim. Provo përsëri më vonë. Sistemi operativ Chrome nuk mundi t'i sinkronizonte të dhënat e tua për shkak të një gabimi në identifikim. diff --git a/chrome/app/resources/google_chrome_strings_sr-Latn.xtb b/chrome/app/resources/google_chrome_strings_sr-Latn.xtb index 3a87f75e51381e..edb79fac606ce4 100644 --- a/chrome/app/resources/google_chrome_strings_sr-Latn.xtb +++ b/chrome/app/resources/google_chrome_strings_sr-Latn.xtb @@ -61,6 +61,7 @@ Neke funkcije su možda nedostupne i promene podešavanja neće biti sačuvane. Chrome traži dozvolu da pristupi kameri i mikrofonu za ovaj sajt Chrome ne može da vam proverava lozinke. Probajte ponovo kasnije. Administrator poslovnog profila može da ukloni sve podatke Chrome-a koji se generišu tokom korišćenja ovog profila (poput pravljenja obeleživača, istorije, lozinki i drugih podešavanja). +Nastavite Google Chrome ne može da sinhronizuje podatke jer Sinhronizacija nije dostupna za domen. Google Chrome želi da izveze lozinke. Unesite lozinku za Windows da biste to omogućili. Deinstaliraj @@ -145,6 +146,7 @@ Neke funkcije su možda nedostupne i promene podešavanja neće biti sačuvane. Dodatak je dodat u Chrome Chrome ne može da vam proverava lozinke zato što niste prijavljeni Google Chrome OS +Poboljšana zaštita nudi više mogućnosti za blokiranje „pecanja“ i malvera Chrome – prijavljivanje na mrežu – Druga radnja u Google Chrome-u je u toku. Probajte ponovo kasnije. Chrome OS ne može da sinhronizuje podatke zbog greške pri prijavljivanju. diff --git a/chrome/app/resources/google_chrome_strings_sr.xtb b/chrome/app/resources/google_chrome_strings_sr.xtb index eb94cdd4b94ec8..1d1656dc7ea5f0 100644 --- a/chrome/app/resources/google_chrome_strings_sr.xtb +++ b/chrome/app/resources/google_chrome_strings_sr.xtb @@ -61,6 +61,7 @@ Chrome тражи дозволу да приступи камери и микрофону за овај сајт Chrome не може да вам проверава лозинке. Пробајте поново касније. Администратор пословног профила може да уклони све податке Chrome-а који се генеришу током коришћења овог профила (попут прављења обележивача, историје, лозинки и других подешавања). +Наставите Google Chrome не може да синхронизује податке јер Синхронизација није доступна за домен. Google Chrome жели да извезе лозинке. Унесите лозинку за Windows да бисте то омогућили. Деинсталирај @@ -145,6 +146,7 @@ Додатак је додат у Chrome Chrome не може да вам проверава лозинке зато што нисте пријављени Google Chrome OS +Побољшана заштита нуди више могућности за блокирање „пецања“ и малвера Chrome – пријављивање на мрежу – Друга радња у Google Chrome-у је у току. Пробајте поново касније. Chrome ОС не може да синхронизује податке због грешке при пријављивању. diff --git a/chrome/app/resources/google_chrome_strings_sv.xtb b/chrome/app/resources/google_chrome_strings_sv.xtb index 0345dd6bfabd38..424808a5f515fa 100644 --- a/chrome/app/resources/google_chrome_strings_sv.xtb +++ b/chrome/app/resources/google_chrome_strings_sv.xtb @@ -61,6 +61,7 @@ Vissa funktioner kanske inte är tillgängliga och ändringar i inställningarna Du behöver ge Chrome behörighet att använda kameran och mikrofonen på webbplatsen Chrome kan inte kontrollera dina lösenord. Försök igen senare. All data i Chrome som uppstår när den här profilen används (t.ex. bokmärken, historik, lösenord och andra inställningar) kan tas bort av jobbprofilens administratör. +Fortsätt Google Chrome kunde inte synkronisera data eftersom synkronisering inte är tillgängligt för din domän. Lösenorden exporteras från Google Chrome. Skriv ditt Windows-lösenord om du tillåter detta. Avinstallera @@ -145,6 +146,7 @@ Vissa funktioner kanske inte är tillgängliga och ändringar i inställningarna har lagts till i Chrome Chrome kan inte kontrollera dina lösenord eftersom du inte är inloggad Google Chrome OS +Förbättrat skydd är bättre på att blockera nätfiske och skadlig programvara Chrome – nätverksinloggning – En annan process i Google Chrome pågår. Försök igen senare. Det gick inte att synkronisera data med Chrome OS på grund av ett inloggningsfel. diff --git a/chrome/app/resources/google_chrome_strings_sw.xtb b/chrome/app/resources/google_chrome_strings_sw.xtb index b9c44f347c2d19..f8be86b6ec2e81 100644 --- a/chrome/app/resources/google_chrome_strings_sw.xtb +++ b/chrome/app/resources/google_chrome_strings_sw.xtb @@ -61,6 +61,7 @@ Baadhi ya vipengele huenda visipatikane na mabadiliko katika mapendeleo hayatahi Chrome inahitaji ruhusa ya kufikia kamera na maikrofoni yako katika tovuti hii Chrome imeshindwa kukagua manenosiri yako. Jaribu tena baadaye. Data yoyote ya Chrome inayozalishwa unapotumia wasifu huu (kama vile alamisho ulizoweka, historia, manenosiri na mipangilio mingine) inaweza kuondolewa na msimamizi wa wasifu huu wa kazini. +Endelea Google Chrome haikuweza kusawazisha data yako kwa sababu Usawazishaji haupatikani kwa kikoa chako. Google Chrome ingependa kuhamisha manenosiri yako. Andika nenosiri lako la Windows ili uruhusu shughuli hii. Ondoa @@ -145,6 +146,7 @@ Baadhi ya vipengele huenda visipatikane na mabadiliko katika mapendeleo hayatahi imeongezwa kwenye Chrome Chrome imeshindwa kukagua manenosiri yako kwa sababu hujaingia katika akaunti Google Chrome OS +Kipengele cha ulinzi wa hali ya juu hufanya mengi zaidi ili kuzuia programu hasidi na wizi wa data binafsi Chrome - Kuingia katika Akaunti ya Mtandao - Kuna shughuli nyingine zinaendelea kwenye Google Chrome. Tafadhali jaribu tena baadaye. Mfumo wa Uendeshaji wa Chrome haukuweza kusawazisha data yako kutokana na hitilafu wakati wa kuingia katika akaunti. diff --git a/chrome/app/resources/google_chrome_strings_ta.xtb b/chrome/app/resources/google_chrome_strings_ta.xtb index 87d876ea6e0237..4ad39544e5bb57 100644 --- a/chrome/app/resources/google_chrome_strings_ta.xtb +++ b/chrome/app/resources/google_chrome_strings_ta.xtb @@ -57,6 +57,7 @@ இந்தத் தளத்திற்காகக் கேமராவையும் மைக்ரோஃபோனையும் அணுக Chromeமுக்கு அனுமதி தேவை Chromeமால் உங்கள் கடவுச்சொற்களைச் சரிபார்க்க முடியவில்லை. பிறகு முயலவும். இந்தச் சுயவிவரத்தைப் பயன்படுத்தும்போது உருவாக்கப்படும் Chrome தரவு அனைத்தையும் (எ.கா. நீங்கள் உருவாக்கும் புக்மார்க்குகள், வரலாறு, கடவுச்சொற்கள் மற்றும் பிற அமைப்புகள்) பணிக் கணக்கு நிர்வாகி அகற்றலாம். +தொடர்க உங்கள் களத்திற்கு ஒத்திசைவு இல்லாததால், Google Chrome ஆல் உங்கள் தரவை ஒத்திசைக்க முடியவில்லை. Google Chrome உங்கள் கடவுச்சொற்களை ஏற்ற விரும்புகிறது. இதை அனுமதிக்க, உங்கள் Windows கடவுச்சொல்லை உள்ளிடவும். நிறுவல் நீக்கு @@ -141,6 +142,7 @@ நீட்டிப்பு Chrome இல் சேர்க்கப்பட்டது நீங்கள் உள்நுழையாததால் Chromeமால் கடவுச்சொற்களைச் சரிபார்க்க முடியவில்லை Google Chrome OS +ஃபிஷிங்கையும் மால்வேரையும் தடுக்க மேம்பட்ட பாதுகாப்பு உதவுகிறது Chrome - நெட்வொர்க் உள்நுழைவு - Google Chrome இல் ஏற்கனவே ஒரு நிறுவி செயல்பாட்டில் உள்ளது. பிறகு முயலவும். உள்நுழைவதில் ஏற்பட்ட பிழைக் காரணமாக Chrome OS ஆல் உங்கள் தரவை ஒத்திசைக்க முடியவில்லை. diff --git a/chrome/app/resources/google_chrome_strings_te.xtb b/chrome/app/resources/google_chrome_strings_te.xtb index ea4e70fc128910..09821ed5474d8e 100644 --- a/chrome/app/resources/google_chrome_strings_te.xtb +++ b/chrome/app/resources/google_chrome_strings_te.xtb @@ -57,6 +57,7 @@ ఈ సైట్ కోసం మీ కెమెరా మరియు మైక్రోఫోన్‌ను యాక్సెస్ చేయడానికి Chromeకు అనుమతి అవసరం Chrome మీ పాస్‌వర్డ్‌లను తనిఖీ చేయలేకపోయింది. తర్వాత మళ్లీ ట్రై చేయండి. ఈ ప్రొఫైల్‌ను ఉపయోగిస్తున్నప్పుడు జెనరేట్ అయిన ఏదైనా Chrome డేటాను (బుక్‌మార్క్‌లు, హిస్టరీ, పాస్‌వర్డ్‌లు, ఇంకా ఇతర సెట్టింగ్‌లు వంటివి క్రియేట్ చేయడం) వర్క్ ప్రొఫైల్ అడ్మినిస్ట్రేటర్ తీసివేయవచ్చు. +కొనసాగించు మీ డొమైన్ కోసం సింక్‌ అందుబాటులో లేనందున Google Chrome మీ డేటాను సింక్ చేయ‌లేక‌పోయింది. Google Chrome మీ పాస్‌వర్డ్‌లను ఎగుమతి చేయాలనుకుంటోంది. దీనిని అనుమతించడం కోసం మీ Windows పాస్‌వర్డ్‌ని టైప్ చేయండి. అన్ఇన్‌స్టాల్ చేయి @@ -141,6 +142,7 @@ Chromeకు జోడించబడింది మీరు సైన్ ఇన్ చేయలేదు కాబట్టి Chrome మీ పాస్‌వర్డ్‌లను తనిఖీ చేయలేదు Google Chrome OS +ఫిషింగ్, అలాగే మాల్‌వేర్‌ను బ్లాక్ చేయడానికి మెరుగుపరచిన రక్షణ మరింత చేయగలదు Chrome - నెట్‌వర్క్ సైన్ ఇన్ - Google Chromeలో మరొక వ్యవస్థాపన జరుగుతోంది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. సైన్ ఇన్ చేయడంలో ఎర్రర్ ఏర్పడినందున Chrome OS మీ డేటాను సింక్ చేయలేకపోయింది. diff --git a/chrome/app/resources/google_chrome_strings_th.xtb b/chrome/app/resources/google_chrome_strings_th.xtb index fa09decedf5f56..b83e2374484896 100644 --- a/chrome/app/resources/google_chrome_strings_th.xtb +++ b/chrome/app/resources/google_chrome_strings_th.xtb @@ -56,6 +56,7 @@ Chrome ต้องการสิทธิ์เข้าถึงไมโครโฟนและกล้องถ่ายรูปของคุณสำหรับเว็บไซต์นี้ Chrome ตรวจสอบรหัสผ่านของคุณไม่ได้ โปรดลองอีกครั้งภายหลัง ผู้ดูแลโปรไฟล์งานนำข้อมูล Chrome ที่สร้างขึ้นในช่วงที่มีการใช้โปรไฟล์นี้ออกได้ (เช่น การสร้างบุ๊กมาร์ก ประวัติการเข้าชม รหัสผ่าน และการตั้งค่าอื่นๆ) +ต่อไป Google Chrome ไม่สามารถซิงค์ข้อมูลของคุณเนื่องจากไม่สามารถใช้การซิงค์กับโดเมนของคุณ Google Chrome ต้องการส่งออกรหัสผ่านของคุณ พิมพ์รหัสผ่าน Windows เพื่ออนุญาตให้ดำเนินการ ถอนการติดตั้ง @@ -140,6 +141,7 @@ เพิ่ม ลงใน Chrome แล้ว Chrome ตรวจสอบรหัสผ่านไม่ได้เพราะคุณไม่ได้ลงชื่อเข้าใช้ ระบบปฏิบัติการ Google Chrome +การปกป้องที่ปรับปรุงแล้วทำได้มากกว่าบล็อกฟิชชิงและมัลแวร์ Chrome - หน้าลงชื่อเข้าใช้ของเครือข่าย - Google Chrome กำลังดำเนินการอย่างอื่นอยู่ โปรดลองอีกครั้งในภายหลัง Chrome OS ไม่สามารถซิงค์ข้อมูลของคุณเนื่องจากเกิดข้อผิดพลาดในการลงชื่อเข้าใช้ @@ -280,6 +282,7 @@ Google Chrome โปรไฟล์งานนี้แยกออกจากโปรไฟล์ส่วนตัวโดยสิ้นเชิง มี Chrome รุ่นใหม่ให้ใช้งานแล้วและเร็วกว่าเดิม +เปิดใน Chrome ด้วยไหม โปรไฟล์ Chrome ช่วยให้คุณแยกข้อมูลต่างๆ ใน Chrome ได้ ซึ่งทำให้แยกการทำงานออกจากความบันเทิงได้ง่ายขึ้น Google Chrome ไม่ตอบสนอง เปิดใช้งานใหม่ตอนนี้หรือไม่ Chrome ต้องการสิทธิ์เข้าถึงกล้องเพื่อสร้างแผนที่ 3 มิติของสิ่งที่อยู่รอบตัวคุณ diff --git a/chrome/app/resources/google_chrome_strings_tr.xtb b/chrome/app/resources/google_chrome_strings_tr.xtb index 2a765df0970cb1..9f61cc81aae1a7 100644 --- a/chrome/app/resources/google_chrome_strings_tr.xtb +++ b/chrome/app/resources/google_chrome_strings_tr.xtb @@ -56,6 +56,7 @@ Chrome'un bu sitede kameranıza ve mikrofonunuza erişmesi için izin gerekiyor Chrome, şifrelerinizi kontrol edemiyor. Daha sonra tekrar deneyin. Bu profil kullanılırken oluşturulan tüm Chrome verileri (yer işaretlerinin oluşturulması, geçmiş, şifreler ve diğer ayarlar gibi) iş profili yöneticisi tarafından kaldırılabilir. +Devam et Senkronizasyon, alan adınızda kullanılamadığından Google Chrome, verilerinizi senkronize edemedi. Google Chrome şifrelerinizi dışa aktarmak istiyor. Buna izin vermek için Windows şifrenizi yazın. Kaldır @@ -140,6 +141,7 @@ Chrome'a eklendi Oturum açmadığınızdan Chrome, şifrelerinizi kontrol edemiyor Google Chrome OS +Gelişmiş koruma, kimlik avını ve kötü amaçlı yazılımları engellemek için daha fazla özellik sunar Chrome - Ağda Oturum Açın - Google Chrome'da başka bir işlem devam ediyor. Lütfen daha sonra yeniden deneyin. Oturum açmadaki bir hata nedeniyle Chrome OS, verilerinizi senkronize edemedi. diff --git a/chrome/app/resources/google_chrome_strings_uk.xtb b/chrome/app/resources/google_chrome_strings_uk.xtb index 91d377f8f94ad5..5dc05b9302f291 100644 --- a/chrome/app/resources/google_chrome_strings_uk.xtb +++ b/chrome/app/resources/google_chrome_strings_uk.xtb @@ -57,6 +57,7 @@ Chrome потрібен дозвіл на використання камери й мікрофона, щоб надати цьому сайту доступ до них Chrome не може перевірити паролі. Повторіть спробу пізніше. Будь-які дані Chrome, створені під час використання цього робочого профілю (наприклад, закладки, історію, паролі й інші налаштування), може видалити його адміністратор. +Продовжити Google Chrome не вдалося синхронізувати ваші дані, оскільки синхронізація для вашого домену недоступна. Google Chrome хоче експортувати ваші паролі. Щоб дозволити, введіть свій пароль Windows. Видалити @@ -141,6 +142,7 @@ Розширення додано в Chrome Chrome не може перевірити паролі, оскільки ви не ввійшли в обліковий запис ОС Google Chrome +Покращений захист ще ефективніше блокує фішинг і зловмисне програмне забезпечення Chrome – Вхід у мережу – У Google Chrome виконується інша операція. Спробуйте пізніше. ОС Chrome не вдалося синхронізувати ваші дані через помилку входу. diff --git a/chrome/app/resources/google_chrome_strings_ur.xtb b/chrome/app/resources/google_chrome_strings_ur.xtb index 91e8922967e786..a12b75acbe3f88 100644 --- a/chrome/app/resources/google_chrome_strings_ur.xtb +++ b/chrome/app/resources/google_chrome_strings_ur.xtb @@ -60,6 +60,7 @@ ‏Chrome کو اس سائٹ کیلئے آپ کے کیمرے اور مائیکروفون تک رسائی کی اجازت درکار ہے ‏Chrome آپ کے پاس ورڈز چیک نہیں کر سکتا ہے۔ بعد میں دوبارہ کوشش کریں۔ ‏دفتری پروفائل کا منتظم اس پروفائل کے استعمال کے دوران جنریٹ ہونے والے کسی بھی Chrome ڈیٹا (جیسے، بُک مارکس کی تخلیق، سرگزشت، پاس ورڈز اور دیگر ترتیبات) کو ہٹا سکتا ہے۔ +جاری رکھیں ‏Google Chrome کلاؤڈ آپ کے ڈیٹا کی مطابقت پذیری نہیں کر سکا کیونکہ مطابقت پذیری آپ کے ڈومین کیلئے فعال نہیں ہے۔ ‏Google Chrome آپ کے پاس ورڈز برآمد کرنا چاہتا ہے۔ اس کی اجازت دینے کیلئے، اپنا Windows پاس ورڈ ٹائپ کریں۔ ان انسٹال کریں @@ -144,6 +145,7 @@ کو Chrome میں شامل کر دیا گیا ہے ‏Chrome آپ کے پاس ورڈز چیک نہیں کر سکتا کیونکہ آپ سائن ان نہیں ہیں Google Chrome OS +فریب دہی اور میلوئیر کو مسدود کرنے کیلئے بہتر کردہ حفاظت مزید کام کرتی ہے ‏Chrome - نیٹ ورک سائن ان - ‏Google Chrome پر ایک اور کارروائی کی جا رہی ہے۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ ‏سائن ان کرنے میں ایک خرابی کی وجہ سے Chrome OS آپ کے ڈیٹا کی مطابقت پذیری نہیں کر سکا۔ diff --git a/chrome/app/resources/google_chrome_strings_uz.xtb b/chrome/app/resources/google_chrome_strings_uz.xtb index 21583afae21e6c..ec77b72b395ef3 100644 --- a/chrome/app/resources/google_chrome_strings_uz.xtb +++ b/chrome/app/resources/google_chrome_strings_uz.xtb @@ -58,6 +58,7 @@ Bu sayt kamera va mikrofoningizdan foydalanishi uchun Chrome brauzeriga ruxsat berishingiz lozim Chrome parollaringizni tekshira olmadi. Keyinroq qayta urining. Bu profil ishlatilganda yaratilgan har qanday Chrome maʼlumotlari (bukmarklar, tarix, parollar va boshqa sozlamalar kabi) ish profili administratori tomonidan tozalanishi mumkin. +Davom etish Google Chrome domeningizda Sync xizmati yo‘qligi sababli ma’lumotlaringizni sinxronlay olmadi. Google Chrome parollaringizni eksport qilmoqchi. Ruxsat berish uchun Windows platformasidagi parolingizni kiriting. O‘chirib tashlash @@ -142,6 +143,7 @@ kengaytmasi Chromega o‘rnatildi Chrome parollaringizni faqat hisobingizga kirganingizdan keyin tekshira oladi Google Chrome OS +Kengaytirilgan himoya fishing va zararli dasturlarni bloklaydi Chrome - Tarmoqqa kirish - Google Chrome boshqa amalni bajarmoqda. Keyinroq qayta urinib ko‘ring. Hisobga kirishdagi xatolik sababli Chrome OS ma’lumotlarni sinxronlay olmadi. @@ -245,6 +247,7 @@ Google Chrome sozlamalaringizni qaytadan tiklay olmadi. Siz Chrome brauzeriga hisobi orqali kirgandingiz. O‘sha hisobdan foydalanib yana qaytadan kiring. Chrome OS shartlari Ma’lumotlarni sinxronlab bo‘lmadi, chunki domeningizda Sync xizmati mavjud emas. +Chrome brauzerining kuchli xavfsizligidan foydalaning Manzil panelida tavsiyalarni namoyish qilish uchun Chrome sizning Drive omboringizdan foydalanadi Google Chrome Dev Qurilmangiz tizimi yangilanganligini Chrome OS sozlamalari orqali bilish mumkin @@ -304,6 +307,7 @@ Google Chrome sozlamalaringizni qaytadan tiklay olmadi. Sizda tizim darajasida o‘rnatish uchun yetarli ruxsatlar yo‘q. O‘rnatish dasturini administrator nomidan qayta ishga tushiring. Chrome’ni qayta ishga tushiring orqali Android telefoningizga raqam yuborish uchun ikkala qurilmada Chrome hisobingizga kiring. +Chrome muhim deb hisoblagan maxfiylik parametrlarini moslang. Bu qoʻllanmada barcha sozlama va parametrlar koʻrsatilmagan. Bu brauzerga ish profilini kiritish bilan siz administratorga ish profili orqali barcha boshqaruv ruxsatlarini berasiz. {0,plural, =0{Chrome uchun yangilanish mavjud}=1{Chrome uchun yangilanish mavjud}other{Chrome uchun yangilanish mavjud (# kun)}} Hisob ma’lumotlaringiz eskirganligi tufayli sinxronlash amali bajarilmadi. diff --git a/chrome/app/resources/google_chrome_strings_vi.xtb b/chrome/app/resources/google_chrome_strings_vi.xtb index 2df88f63d8b202..fff146e4dbec91 100644 --- a/chrome/app/resources/google_chrome_strings_vi.xtb +++ b/chrome/app/resources/google_chrome_strings_vi.xtb @@ -59,6 +59,7 @@ Chrome cần có quyền truy cập vào máy ảnh và micrô của bạn cho trang web này Chrome không thể kiểm tra mật khẩu của bạn. Hãy thử lại sau. Quản trị viên hồ sơ công việc có thể xóa mọi dữ liệu trên Chrome được tạo trong quá trình sử dụng hồ sơ này (chẳng hạn như hoạt động tạo dấu trang, các trang web đã truy cập, mật khẩu và các tùy chọn cài đặt khác). +Tiếp tục Google Chrome không thể đồng bộ hóa dữ liệu của bạn vì Đồng bộ hóa không khả dụng cho miền của bạn. Google Chrome muốn xuất các mật khẩu của bạn. Hãy nhập mật khẩu Windows để cho phép thực hiện việc này. Gỡ cài đặt @@ -143,6 +144,7 @@ đã được thêm vào Chrome Chrome không thể kiểm tra mật khẩu của bạn vì bạn chưa đăng nhập Google Chrome OS +Chế độ bảo vệ tăng cường giúp chặn phần mềm độc hại và hành vi lừa đảo hiệu quả hơn Chrome – Đăng nhập vào mạng – Một hoạt động khác trên Google Chrome đang diễn ra. Vui lòng thử lại sau. Chrome OS không thể đồng bộ hóa dữ liệu của bạn do lỗi khi đăng nhập. diff --git a/chrome/app/resources/google_chrome_strings_zh-CN.xtb b/chrome/app/resources/google_chrome_strings_zh-CN.xtb index 68a281ebc45a70..1987589191f75f 100644 --- a/chrome/app/resources/google_chrome_strings_zh-CN.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-CN.xtb @@ -56,6 +56,7 @@ Chrome 需要获得相应权限,才能允许此网站使用您的摄像头和麦克风 Chrome 无法检查您的密码。请稍后重试。 在使用此工作资料(例如创建书签、历史记录、密码和其他设置)时生成的任何 Chrome 数据都可由工作资料管理员移除。 +继续 由于您的网域停用了同步功能,Google Chrome无法同步您的数据。 Google Chrome 想导出您的密码。请输入您的 Windows 密码以允许此操作。 卸载 @@ -140,6 +141,7 @@ ”已添加到 Chrome Chrome 无法检查您的密码,因为您未登录 Google Chrome 操作系统 +“增强型保护”选项在防范网上诱骗和恶意软件方面更高一筹 Chrome - 网络登录 - Google Chrome 正在执行另一项操作,请稍后重试。 登录时出现错误,Chrome操作系统无法同步您的数据。 diff --git a/chrome/app/resources/google_chrome_strings_zh-HK.xtb b/chrome/app/resources/google_chrome_strings_zh-HK.xtb index 46db69713a2ab9..9c0bce909d96bf 100644 --- a/chrome/app/resources/google_chrome_strings_zh-HK.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-HK.xtb @@ -60,6 +60,7 @@ Chrome 需要取得權限,才能讓這個網站存取您的相機和麥克風 Chrome 無法檢查密碼,請稍後再試。 工作設定檔管理員可移除任何在使用此設定檔時產生的 Chrome 資料 (例如建立的書籤、記錄、密碼和其他設定)。 +繼續 您的網域無法使用「同步功能」,因此 Google Chrome 無法同步處理您的數據。 Google Chrome 想匯出您的密碼。請輸入 Windows 密碼以允許此操作。 解除安裝 @@ -144,6 +145,7 @@ 已將 加到 Chrome 由於您尚未登入帳戶,因此 Chrome 無法檢查密碼 Google Chrome 作業系統 +強化保護功能可進一步封鎖仿冒詐騙和惡意軟件 Chrome - 網絡登入 - Google Chrome 正在執行另一項操作,請稍後再試。 登入時發生錯誤,因此 Chrome 作業系統無法同步處理您的數據。 @@ -288,6 +290,7 @@ Google Chrome 無法復原您的設定。 Google Chrome 此工作設定檔與個人設定檔是完全分開。 Google Chrome 推出全新版本,速度更勝從前。 +要一併在 Chrome 中開啟這項功能嗎? 透過 Chrome 設定檔,您可將所有 Chrome 內容分門別類,從而更輕易劃分工作和娛樂內容。 Google Chrome 沒有回應,要立即重新啟動嗎? Chrome 需要取得權限,才能存取相機以建立您身處環境的 3D 地圖 diff --git a/chrome/app/resources/google_chrome_strings_zh-TW.xtb b/chrome/app/resources/google_chrome_strings_zh-TW.xtb index 606a0fd7768c3a..3ef6403e8fcbae 100644 --- a/chrome/app/resources/google_chrome_strings_zh-TW.xtb +++ b/chrome/app/resources/google_chrome_strings_zh-TW.xtb @@ -56,6 +56,7 @@ Chrome 需要相關權限,才能讓這個網站使用你的攝影機和麥克風 Chrome 無法檢查你的密碼,請稍後再試。 凡是在使用這個資料夾期間產生的 Chrome 資料 (例如建立的書籤、歷史記錄、密碼和其他設定),工作資料夾管理員皆可予以移除。 +繼續 你的網域無法使用「同步功能」,因此 Google Chrome 無法同步處理你的資料。 Google Chrome 要求匯出你的密碼。如果允許,請輸入你的 Windows 密碼。 解除安裝 @@ -140,6 +141,7 @@ 已將「」加到 Chrome 你尚未登入帳戶,因此 Chrome 無法檢查你的密碼 Google Chrome 作業系統 +強化防護功能可進一步封鎖網路詐騙和惡意軟體 Chrome - 網路登入 - Google Chrome 正在執行另一項作業,請稍後再試。 登入時發生錯誤,因此 Chrome 作業系統無法同步處理你的資料。 @@ -283,6 +285,7 @@ Google Chrome 無法復原你的設定。 Google Chrome 這個工作資料夾與個人資料夾各自獨立。 Google Chrome 推出全新版本,速度更勝以往。 +要一併在 Chrome 中開啟這項功能嗎? 你可以運用 Chrome 設定檔區隔各種 Chrome 資料,更輕鬆區分工作和娛樂。 Google Chrome 沒有回應,要立即重新啟動嗎? Chrome 需要取得攝影機權限,才能根據你的周遭環境建立 3D 地圖 diff --git a/chrome/app/resources/google_chrome_strings_zu.xtb b/chrome/app/resources/google_chrome_strings_zu.xtb index 5f6fbe0f975320..b2e0e1b8766acf 100644 --- a/chrome/app/resources/google_chrome_strings_zu.xtb +++ b/chrome/app/resources/google_chrome_strings_zu.xtb @@ -61,6 +61,7 @@ Ezinye izici kungenzeka zingabi khona futhi izinguquko kokuncamelayo ngeke zize I-Chrome idinga imvume ukuze ifinyelele kukhamera yakho nemakrofoni yaleli sayithi I-Chrome ayikwazi ukuhlola amaphasiwedi akho. Zama futhi emuva kwesikhathi. Noma iyiphi idatha ye-Chrome ekhiqizwa ngesikhathi sokusetshenziswa kwale phrofayela (efana nokudalwa kwamabhukhimakhi, umlando, amaphasiwedi, namanye amasethingi) ingasuswa umlawuli wephrofayela yomsebenzi. +Qhubeka I-Google Chrome ayikwazanga ukuvumelanisa idatha yakho ngoba ukuvumelanisa akutholakali kusizinda sakho. I-Google Chrome ifuna ukuthumela amaphasiwedi akho. Thayipha iphasiwedi yakho ye-Windows ukuze uvumele lokhu. Khipha @@ -145,6 +146,7 @@ Ezinye izici kungenzeka zingabi khona futhi izinguquko kokuncamelayo ngeke zize I- ingezwe ku-Chrome I-Chrome ayikwazi ukuhlola amaphasiwedi akho ngoba awungenanga ngemvume I-Google Chrome OS +Isivikelo esithuthukisiwe senza okuningi ukuvimba ubugebengu bokweba imininingwane ebucayi kanye uhlelo olungayilungele ikhompyutha I-Chrome - Inethiwekhi Yokungena ngemvume - Okunye ukusebenza ku-Google Chrome kuyenzeka manje. Sicela uzame futhi emuva kwesikhathi. I-Chrome OS ayikwazanga ukuvumelanisa idatha yakho ngenxa yephutha lokungena ngemvume. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 8e9d724f45ff0e..4b7237ee72bf79 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -7487,6 +7487,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kForceMajorVersion100InUserAgentName, flag_descriptions::kForceMajorVersion100InUserAgentDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kForceMajorVersion100InUserAgent)}, + {"force-minor-version-to-100", + flag_descriptions::kForceMinorVersion100InUserAgentName, + flag_descriptions::kForceMinorVersion100InUserAgentDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kForceMinorVersion100InUserAgent)}, {"autofill-enable-offer-notification-for-promo-codes", flag_descriptions::kAutofillEnableOfferNotificationForPromoCodesName, flag_descriptions:: diff --git a/chrome/browser/ash/account_manager/account_apps_availability.cc b/chrome/browser/ash/account_manager/account_apps_availability.cc index 96f38314231617..7ed124e7e2bf67 100644 --- a/chrome/browser/ash/account_manager/account_apps_availability.cc +++ b/chrome/browser/ash/account_manager/account_apps_availability.cc @@ -55,6 +55,22 @@ bool IsPrefInitialized(PrefService* prefs) { return accounts && (accounts->DictSize() > 0 || IsActiveDirectoryUser()); } +void CompleteFindAccountByGaiaId( + const std::string& gaia_id, + base::OnceCallback&)> + callback, + const std::vector& accounts) { + for (const auto& account : accounts) { + if (account.key.account_type() == account_manager::AccountType::kGaia && + account.key.id() == gaia_id) { + std::move(callback).Run(account); + return; + } + } + LOG(ERROR) << "Couldn't find account by gaia id in AccountManager"; + std::move(callback).Run(absl::nullopt); +} + void CompleteGetAccountsAvailableInArc( const base::flat_set& gaia_ids_in_arc, base::OnceCallback&)> @@ -226,8 +242,13 @@ void AccountAppsAvailability::SetIsAccountAvailableInArc( absl::optional current_status = IsAccountAvailableInArc(prefs_, account.key.id()); if (!current_status.has_value()) { + // Account is not in prefs yet - add a new entry. AddAccountToPrefs(prefs_, account.key.id(), is_available); - NotifyObservers(account, is_available); + + // Notify observers only if account should be available. + if (is_available) + NotifyObservers(account, is_available); + return; } @@ -268,7 +289,21 @@ void AccountAppsAvailability::OnRefreshTokenUpdatedForAccount( return; } - NOTIMPLEMENTED(); + absl::optional current_status = + IsAccountAvailableInArc(prefs_, account_info.gaia); + // - If `current_status.has_value()` is `false` - this account is not in prefs + // yet. This happens when account is just added and + // `SetIsAccountAvailableInArc()` wasn't called yet. + // - If `current_status.value()` is `false` - this account is not available in + // ARC. In this case we don't want to notify the observers. + if (!current_status.has_value() || !current_status.value()) + return; + + FindAccountByGaiaId( + account_info.gaia, + base::BindOnce(&AccountAppsAvailability::MaybeNotifyObservers, + weak_factory_.GetWeakPtr(), + /*is_available_in_arc=*/true)); } void AccountAppsAvailability::OnAccountUpserted( @@ -286,6 +321,9 @@ void AccountAppsAvailability::OnAccountUpserted( void AccountAppsAvailability::OnAccountRemoved( const account_manager::Account& account) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + if (account.key.account_type() != account_manager::AccountType::kGaia) + return; + if (!IsInitialized()) { // Using base::Unretained(this) is fine because `initialization_callbacks_` // is owned by this. @@ -349,6 +387,23 @@ void AccountAppsAvailability::InitAccountsAvailableInArcPref( initialization_callbacks_.clear(); } +void AccountAppsAvailability::FindAccountByGaiaId( + const std::string& gaia_id, + base::OnceCallback&)> + callback) { + account_manager_facade_->GetAccounts(base::BindOnce( + &CompleteFindAccountByGaiaId, gaia_id, std::move(callback))); +} + +void AccountAppsAvailability::MaybeNotifyObservers( + bool is_available_in_arc, + const absl::optional& account) { + if (!account) + return; + + NotifyObservers(account.value(), is_available_in_arc); +} + void AccountAppsAvailability::NotifyObservers( const account_manager::Account& account, bool is_available_in_arc) { diff --git a/chrome/browser/ash/account_manager/account_apps_availability.h b/chrome/browser/ash/account_manager/account_apps_availability.h index 6a3f6c351a4cc3..4907befa00f0b6 100644 --- a/chrome/browser/ash/account_manager/account_apps_availability.h +++ b/chrome/browser/ash/account_manager/account_apps_availability.h @@ -103,6 +103,19 @@ class AccountAppsAvailability void InitAccountsAvailableInArcPref( const std::vector& accounts); + // Call `GetAccounts` and find the account by `gaia_id`. Call the `callback` + // with the resulted account or with `nullopt` if requested account is not in + // Account Manager. + void FindAccountByGaiaId( + const std::string& gaia_id, + base::OnceCallback&)> + callback); + + // Call `NotifyObservers` if account is not `nullopt`. + void MaybeNotifyObservers( + bool is_available_in_arc, + const absl::optional& account); + // Call `OnAccountAvailableInArc` if `is_available_in_arc` is `true`. // Otherwise call `OnAccountUnavailableInArc`. void NotifyObservers(const account_manager::Account& account, diff --git a/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc b/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc index 2de4b2c09c4ce6..6b8ac71f1025e4 100644 --- a/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc +++ b/chrome/browser/ash/account_manager/account_apps_availability_unittest.cc @@ -26,6 +26,9 @@ using testing::_; using testing::Contains; +using testing::InSequence; + +using Checkpoint = ::testing::MockFunction; namespace ash { @@ -280,4 +283,172 @@ TEST_F(AccountAppsAvailabilityTest, SetIsAccountAvailableInArc) { } } +TEST_F(AccountAppsAvailabilityTest, ObserversAreCalledWhenAvailabilityChanges) { + const AccountInfo secondary_account_1_info = + identity_test_env()->MakeAccountAvailable(kSecondaryAccount1Email); + const account_manager::Account primary_account = + CreateAccount(kPrimaryAccountEmail, primary_account_info()->gaia); + const account_manager::Account secondary_account_1 = + CreateAccount(kSecondaryAccount1Email, secondary_account_1_info.gaia); + + auto account_apps_availability = CreateAccountAppsAvailability(); + // Wait for initialization to finish. + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(account_apps_availability->IsInitialized()); + + MockObserver mock_observer; + base::ScopedObservation + observation{&mock_observer}; + observation.Observe(account_apps_availability.get()); + + Checkpoint checkpoint; + { + InSequence s; + + EXPECT_CALL(mock_observer, + OnAccountUnavailableInArc(AccountEqual(secondary_account_1))) + .Times(1); + EXPECT_CALL(checkpoint, Call(1)); + EXPECT_CALL(mock_observer, + OnAccountAvailableInArc(AccountEqual(secondary_account_1))) + .Times(1); + } + + // [Account is available in ARC] Remove an account from ARC - observer is + // called. + account_apps_availability->SetIsAccountAvailableInArc(secondary_account_1, + false); + + checkpoint.Call(1); + + // [Account is NOT available in ARC] Add an account to ARC - observer is + // called. + account_apps_availability->SetIsAccountAvailableInArc(secondary_account_1, + true); +} + +TEST_F(AccountAppsAvailabilityTest, + ObserversAreNotCalledWhenAvailabilityDoesntChange) { + const AccountInfo secondary_account_1_info = + identity_test_env()->MakeAccountAvailable(kSecondaryAccount1Email); + const account_manager::Account primary_account = + CreateAccount(kPrimaryAccountEmail, primary_account_info()->gaia); + const account_manager::Account secondary_account_1 = + CreateAccount(kSecondaryAccount1Email, secondary_account_1_info.gaia); + + auto account_apps_availability = CreateAccountAppsAvailability(); + // Wait for initialization to finish. + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(account_apps_availability->IsInitialized()); + + MockObserver mock_observer; + base::ScopedObservation + observation{&mock_observer}; + observation.Observe(account_apps_availability.get()); + + Checkpoint checkpoint; + { + InSequence s; + + EXPECT_CALL(mock_observer, OnAccountAvailableInArc(_)).Times(0); + EXPECT_CALL(mock_observer, OnAccountUnavailableInArc(_)).Times(0); + EXPECT_CALL(checkpoint, Call(1)); + EXPECT_CALL(mock_observer, OnAccountAvailableInArc(_)).Times(0); + EXPECT_CALL(mock_observer, OnAccountUnavailableInArc(_)).Times(0); + } + + // [Account is available in ARC] Add the same account again - observer is not + // called. + account_apps_availability->SetIsAccountAvailableInArc(secondary_account_1, + true); + checkpoint.Call(1); + + const AccountInfo secondary_account_2_info = + identity_test_env()->MakeAccountAvailable(kSecondaryAccount2Email); + const account_manager::Account secondary_account_2 = + CreateAccount(kSecondaryAccount2Email, secondary_account_2_info.gaia); + + // [Account is NOT available in ARC] Account is removed from ARC - observer is + // not called. + account_apps_availability->SetIsAccountAvailableInArc(secondary_account_2, + false); +} + +TEST_F(AccountAppsAvailabilityTest, + ObserversAreCalledWhenAvailableAccountIsChanged) { + const AccountInfo secondary_account_1_info = + identity_test_env()->MakeAccountAvailable(kSecondaryAccount1Email); + const account_manager::Account primary_account = + CreateAccount(kPrimaryAccountEmail, primary_account_info()->gaia); + const account_manager::Account secondary_account_1 = + CreateAccount(kSecondaryAccount1Email, secondary_account_1_info.gaia); + + auto account_apps_availability = CreateAccountAppsAvailability(); + // Wait for initialization to finish. + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(account_apps_availability->IsInitialized()); + + MockObserver mock_observer; + base::ScopedObservation + observation{&mock_observer}; + observation.Observe(account_apps_availability.get()); + + EXPECT_CALL(mock_observer, + OnAccountAvailableInArc(AccountEqual(secondary_account_1))) + .Times(1); + // [Account is available in ARC] Account is upserted - observer is called. + identity_test_env()->SetRefreshTokenForAccount( + secondary_account_1_info.account_id); + // Wait for async calls to finish. + base::RunLoop().RunUntilIdle(); +} + +TEST_F(AccountAppsAvailabilityTest, + ObserversAreNotCalledWhenUnavailableAccountIsChanged) { + const AccountInfo secondary_account_1_info = + identity_test_env()->MakeAccountAvailable(kSecondaryAccount1Email); + const account_manager::Account primary_account = + CreateAccount(kPrimaryAccountEmail, primary_account_info()->gaia); + const account_manager::Account secondary_account_1 = + CreateAccount(kSecondaryAccount1Email, secondary_account_1_info.gaia); + + auto account_apps_availability = CreateAccountAppsAvailability(); + // Wait for initialization to finish. + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(account_apps_availability->IsInitialized()); + + MockObserver mock_observer; + base::ScopedObservation + observation{&mock_observer}; + observation.Observe(account_apps_availability.get()); + + Checkpoint checkpoint; + { + InSequence s; + + EXPECT_CALL(mock_observer, + OnAccountUnavailableInArc(AccountEqual(secondary_account_1))) + .Times(1); + EXPECT_CALL(checkpoint, Call(1)); + EXPECT_CALL(mock_observer, OnAccountAvailableInArc(_)).Times(0); + EXPECT_CALL(mock_observer, OnAccountUnavailableInArc(_)).Times(0); + } + + // Remove an account from ARC. + account_apps_availability->SetIsAccountAvailableInArc(secondary_account_1, + false); + checkpoint.Call(1); + + // [Account is NOT available in ARC] Account is upserted - observer is not + // called. + identity_test_env()->SetRefreshTokenForAccount( + secondary_account_1_info.account_id); + // Wait for async calls to finish. + base::RunLoop().RunUntilIdle(); +} + } // namespace ash diff --git a/chrome/browser/ash/crosapi/dlp_ash.cc b/chrome/browser/ash/crosapi/dlp_ash.cc index 75ca477af26ecf..dfcc04a4a0a78e 100644 --- a/chrome/browser/ash/crosapi/dlp_ash.cc +++ b/chrome/browser/ash/crosapi/dlp_ash.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "chrome/browser/ash/crosapi/window_util.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set.h" #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h" @@ -67,8 +67,8 @@ void DlpAsh::DlpRestrictionsUpdated(const std::string& window_id, LOG(WARNING) << "Didn't find Lacros window with id: " << window_id; return; } - policy::DlpContentManager* dlp_content_manager = - policy::DlpContentManager::Get(); + policy::DlpContentManagerAsh* dlp_content_manager = + policy::DlpContentManagerAsh::Get(); DCHECK(dlp_content_manager); dlp_content_manager->OnWindowRestrictionChanged( window, ConvertMojoToDlpContentRestrictionSet(restrictions)); diff --git a/chrome/browser/ash/login/guest_login_browsertest.cc b/chrome/browser/ash/login/guest_login_browsertest.cc index 1e2b63c070e96a..c7359a60129fe4 100644 --- a/chrome/browser/ash/login/guest_login_browsertest.cc +++ b/chrome/browser/ash/login/guest_login_browsertest.cc @@ -2,13 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ash/constants/ash_features.h" #include "ash/public/cpp/keyboard/keyboard_controller.h" #include "ash/public/cpp/login_screen_test_api.h" #include "chrome/browser/about_flags.h" +#include "chrome/browser/ash/login/startup_utils.h" +#include "chrome/browser/ash/login/test/js_checker.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h" +#include "chrome/browser/ash/login/test/oobe_screen_waiter.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" +#include "chrome/browser/ui/webui/chromeos/login/guest_tos_screen_handler.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/session_manager/fake_session_manager_client.h" @@ -19,6 +24,9 @@ namespace ash { +constexpr char kGuestTosId[] = "guest-tos"; +const test::UIPath kGuestTosAcceptButton = {kGuestTosId, "acceptButton"}; + // Tests guest user log in. class GuestLoginTest : public MixinBasedInProcessBrowserTest { public: @@ -40,6 +48,15 @@ class GuestLoginTest : public MixinBasedInProcessBrowserTest { MixinBasedInProcessBrowserTest::SetUpOnMainThread(); } + void StartGuestSession() { + ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + + if (chromeos::features::IsOobeConsolidatedConsentEnabled()) { + OobeScreenWaiter(GuestTosScreenView::kScreenId).Wait(); + test::OobeJS().ClickOnPath(kGuestTosAcceptButton); + } + } + protected: LoginManagerMixin login_manager_{&mixin_host_, {}}; }; @@ -71,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(GuestLoginTest, PRE_Login) { FakeSessionManagerClient::Get()->set_restart_job_callback( restart_job_waiter.QuitClosure()); - ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + StartGuestSession(); restart_job_waiter.Run(); EXPECT_TRUE(FakeSessionManagerClient::Get()->restart_job_argv().has_value()); @@ -89,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(GuestLoginTest, PRE_ExitFullscreenOnSuspend) { FakeSessionManagerClient::Get()->set_restart_job_callback( restart_job_waiter.QuitClosure()); - ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + StartGuestSession(); restart_job_waiter.Run(); EXPECT_TRUE(FakeSessionManagerClient::Get()->restart_job_argv().has_value()); @@ -114,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(GuestLoginTest, FakeSessionManagerClient::Get()->set_restart_job_callback( restart_job_waiter.QuitClosure()); - ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + StartGuestSession(); restart_job_waiter.Run(); EXPECT_TRUE(FakeSessionManagerClient::Get()->restart_job_argv().has_value()); @@ -137,6 +154,27 @@ IN_PROC_BROWSER_TEST_F(GuestLoginTest, EXPECT_TRUE(config.voice_input); } +// When Eula is marked as accepted, the Guest ToS screen is skipped. +IN_PROC_BROWSER_TEST_F(GuestLoginTest, PRE_SkipGuestToS) { + StartupUtils::MarkEulaAccepted(); + + base::RunLoop restart_job_waiter; + FakeSessionManagerClient::Get()->set_restart_job_callback( + restart_job_waiter.QuitClosure()); + + ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + + restart_job_waiter.Run(); + EXPECT_TRUE(FakeSessionManagerClient::Get()->restart_job_argv().has_value()); +} + +IN_PROC_BROWSER_TEST_F(GuestLoginTest, SkipGuestToS) { + login_manager_.WaitForActiveSession(); + + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); + EXPECT_TRUE(user_manager->IsLoggedInAsGuest()); +} + IN_PROC_BROWSER_TEST_F(GuestLoginWithLoginSwitchesTest, PRE_Login) { base::RunLoop restart_job_waiter; FakeSessionManagerClient::Get()->set_restart_job_callback( @@ -144,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(GuestLoginWithLoginSwitchesTest, PRE_Login) { EXPECT_TRUE( base::CommandLine::ForCurrentProcess()->HasSwitch("feature-switch")); - ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); + StartGuestSession(); restart_job_waiter.Run(); EXPECT_TRUE(FakeSessionManagerClient::Get()->restart_job_argv().has_value()); diff --git a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc index 3f5213fb81801f..a82145c2a1c892 100644 --- a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc +++ b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc @@ -19,6 +19,7 @@ #include "base/bind_internal.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/login_manager_test.h" +#include "chrome/browser/ash/login/startup_utils.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h" #include "chrome/browser/ash/login/test/user_policy_mixin.h" #include "chrome/browser/ash/login/ui/user_adding_screen.h" @@ -233,6 +234,9 @@ IN_PROC_BROWSER_TEST_F(ShillProfileLoadingGuestLoginTest, GuestLogin) { LoadShillProfileWaiter load_shill_profile_waiter( FakeSessionManagerClient::Get()); + + // Mark EULA accepted to skip the guest ToS screen. + StartupUtils::MarkEulaAccepted(); ASSERT_TRUE(LoginScreenTestApi::ClickGuestButton()); restart_job_waiter.Run(); diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc similarity index 86% rename from chrome/browser/ash/policy/dlp/dlp_content_manager.cc rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc index 70b6906086a876..b6355604e967d6 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include #include @@ -111,40 +111,40 @@ void InterruptVideoRecording() { } // namespace -static DlpContentManager* g_dlp_content_manager = nullptr; +static DlpContentManagerAsh* g_dlp_content_manager = nullptr; // static -DlpContentManager* DlpContentManager::Get() { +DlpContentManagerAsh* DlpContentManagerAsh::Get() { if (!g_dlp_content_manager) { - g_dlp_content_manager = new DlpContentManager(); + g_dlp_content_manager = new DlpContentManagerAsh(); g_dlp_content_manager->Init(); } return g_dlp_content_manager; } -void DlpContentManager::OnWindowOcclusionChanged(aura::Window* window) { +void DlpContentManagerAsh::OnWindowOcclusionChanged(aura::Window* window) { // Stop video captures that now might include restricted content. CheckRunningVideoCapture(); } -void DlpContentManager::OnWindowDestroying(aura::Window* window) { +void DlpContentManagerAsh::OnWindowDestroying(aura::Window* window) { window_observers_.erase(window); MaybeChangeOnScreenRestrictions(); } -DlpContentRestrictionSet DlpContentManager::GetConfidentialRestrictions( +DlpContentRestrictionSet DlpContentManagerAsh::GetConfidentialRestrictions( content::WebContents* web_contents) const { if (!base::Contains(confidential_web_contents_, web_contents)) return DlpContentRestrictionSet(); return confidential_web_contents_.at(web_contents); } -DlpContentRestrictionSet DlpContentManager::GetOnScreenPresentRestrictions() +DlpContentRestrictionSet DlpContentManagerAsh::GetOnScreenPresentRestrictions() const { return on_screen_restrictions_; } -bool DlpContentManager::IsScreenshotRestricted(const ScreenshotArea& area) { +bool DlpContentManagerAsh::IsScreenshotRestricted(const ScreenshotArea& area) { const ConfidentialContentsInfo info = GetAreaConfidentialContentsInfo(area, DlpContentRestriction::kScreenshot); MaybeReportEvent(info.restriction_info, @@ -154,7 +154,8 @@ bool DlpContentManager::IsScreenshotRestricted(const ScreenshotArea& area) { return IsBlocked(info.restriction_info); } -bool DlpContentManager::IsScreenshotApiRestricted(const ScreenshotArea& area) { +bool DlpContentManagerAsh::IsScreenshotApiRestricted( + const ScreenshotArea& area) { const ConfidentialContentsInfo info = GetAreaConfidentialContentsInfo(area, DlpContentRestriction::kScreenshot); MaybeReportEvent(info.restriction_info, @@ -165,7 +166,7 @@ bool DlpContentManager::IsScreenshotApiRestricted(const ScreenshotArea& area) { return IsBlocked(info.restriction_info) || IsWarn(info.restriction_info); } -void DlpContentManager::CheckScreenshotRestriction( +void DlpContentManagerAsh::CheckScreenshotRestriction( const ScreenshotArea& area, ash::OnCaptureModeDlpRestrictionChecked callback) { const ConfidentialContentsInfo info = @@ -177,7 +178,7 @@ void DlpContentManager::CheckScreenshotRestriction( CheckScreenCaptureRestriction(info, std::move(callback)); } -void DlpContentManager::CheckPrintingRestriction( +void DlpContentManagerAsh::CheckPrintingRestriction( content::WebContents* web_contents, OnDlpRestrictionCheckedCallback callback) { const RestrictionLevelAndUrl restriction_info = @@ -211,7 +212,7 @@ void DlpContentManager::CheckPrintingRestriction( &MaybeReportWarningProceededEvent, restriction_info.url, DlpRulesManager::Restriction::kPrinting, reporting_manager_); warn_notifier_->ShowDlpPrintWarningDialog(base::BindOnce( - &DlpContentManager::OnDlpWarnDialogReply, base::Unretained(this), + &DlpContentManagerAsh::OnDlpWarnDialogReply, base::Unretained(this), DlpConfidentialContents({web_contents}), DlpRulesManager::Restriction::kPrinting, std::move(reporting_callback).Then(std::move(callback)))); @@ -222,7 +223,7 @@ void DlpContentManager::CheckPrintingRestriction( std::move(callback).Run(true); } -bool DlpContentManager::IsScreenCaptureRestricted( +bool DlpContentManagerAsh::IsScreenCaptureRestricted( const content::DesktopMediaID& media_id) { const ConfidentialContentsInfo info = GetScreenShareConfidentialContentsInfo(media_id); @@ -233,7 +234,7 @@ bool DlpContentManager::IsScreenCaptureRestricted( return IsBlocked(info.restriction_info); } -void DlpContentManager::CheckScreenShareRestriction( +void DlpContentManagerAsh::CheckScreenShareRestriction( const content::DesktopMediaID& media_id, const std::u16string& application_title, OnDlpRestrictionCheckedCallback callback) { @@ -258,10 +259,10 @@ void DlpContentManager::CheckScreenShareRestriction( std::move(callback).Run(true); return; } - // base::Unretained(this) is safe here because DlpContentManager is + // base::Unretained(this) is safe here because DlpContentManagerAsh is // initialized as a singleton that's always available in the system. warn_notifier_->ShowDlpScreenShareWarningDialog( - base::BindOnce(&DlpContentManager::OnDlpWarnDialogReply, + base::BindOnce(&DlpContentManagerAsh::OnDlpWarnDialogReply, base::Unretained(this), info.confidential_contents, DlpRulesManager::Restriction::kScreenShare, std::move(callback)), @@ -272,7 +273,7 @@ void DlpContentManager::CheckScreenShareRestriction( std::move(callback).Run(true); } -void DlpContentManager::OnVideoCaptureStarted(const ScreenshotArea& area) { +void DlpContentManagerAsh::OnVideoCaptureStarted(const ScreenshotArea& area) { if (IsScreenshotRestricted(area)) { InterruptVideoRecording(); return; @@ -281,7 +282,7 @@ void DlpContentManager::OnVideoCaptureStarted(const ScreenshotArea& area) { running_video_capture_info_.emplace(area); } -void DlpContentManager::CheckStoppedVideoCapture( +void DlpContentManagerAsh::CheckStoppedVideoCapture( ash::OnCaptureModeDlpRestrictionChecked callback) { // If some confidential content was shown during the recording, but not // before, warn the user before saving the file. @@ -297,7 +298,7 @@ void DlpContentManager::CheckStoppedVideoCapture( running_video_capture_info_.reset(); } -bool DlpContentManager::IsCaptureModeInitRestricted() { +bool DlpContentManagerAsh::IsCaptureModeInitRestricted() { const RestrictionLevelAndUrl restriction_info = GetOnScreenPresentRestrictions().GetRestrictionLevelAndUrl( DlpContentRestriction::kScreenshot); @@ -307,7 +308,7 @@ bool DlpContentManager::IsCaptureModeInitRestricted() { return IsBlocked(restriction_info); } -void DlpContentManager::CheckCaptureModeInitRestriction( +void DlpContentManagerAsh::CheckCaptureModeInitRestriction( ash::OnCaptureModeDlpRestrictionChecked callback) { const ConfidentialContentsInfo info = GetConfidentialContentsOnScreen(DlpContentRestriction::kScreenshot); @@ -319,7 +320,7 @@ void DlpContentManager::CheckCaptureModeInitRestriction( CheckScreenCaptureRestriction(info, std::move(callback)); } -void DlpContentManager::OnScreenCaptureStarted( +void DlpContentManagerAsh::OnScreenCaptureStarted( const std::string& label, std::vector screen_capture_ids, const std::u16string& application_title, @@ -333,7 +334,7 @@ void DlpContentManager::OnScreenCaptureStarted( CheckRunningScreenShares(); } -void DlpContentManager::OnScreenCaptureStopped( +void DlpContentManagerAsh::OnScreenCaptureStopped( const std::string& label, const content::DesktopMediaID& media_id) { base::EraseIf( @@ -346,7 +347,7 @@ void DlpContentManager::OnScreenCaptureStopped( }); } -void DlpContentManager::OnWindowRestrictionChanged( +void DlpContentManagerAsh::OnWindowRestrictionChanged( aura::Window* window, const DlpContentRestrictionSet& restrictions) { confidential_windows_[window] = restrictions; @@ -355,20 +356,20 @@ void DlpContentManager::OnWindowRestrictionChanged( } /* static */ -void DlpContentManager::SetDlpContentManagerForTesting( - DlpContentManager* dlp_content_manager) { +void DlpContentManagerAsh::SetDlpContentManagerAshForTesting( + DlpContentManagerAsh* dlp_content_manager) { if (g_dlp_content_manager) delete g_dlp_content_manager; g_dlp_content_manager = dlp_content_manager; } /* static */ -void DlpContentManager::ResetDlpContentManagerForTesting() { +void DlpContentManagerAsh::ResetDlpContentManagerAshForTesting() { g_dlp_content_manager = nullptr; } -DlpContentManager::ScreenShareInfo::ScreenShareInfo() = default; -DlpContentManager::ScreenShareInfo::ScreenShareInfo( +DlpContentManagerAsh::ScreenShareInfo::ScreenShareInfo() = default; +DlpContentManagerAsh::ScreenShareInfo::ScreenShareInfo( const std::string& label, const content::DesktopMediaID& media_id, const std::u16string& application_title, @@ -377,68 +378,69 @@ DlpContentManager::ScreenShareInfo::ScreenShareInfo( media_id_(media_id), application_title_(application_title), state_change_callback_(state_change_callback) {} -DlpContentManager::ScreenShareInfo::ScreenShareInfo( - const DlpContentManager::ScreenShareInfo& other) = default; -DlpContentManager::ScreenShareInfo& -DlpContentManager::ScreenShareInfo::operator=( - const DlpContentManager::ScreenShareInfo& other) = default; -DlpContentManager::ScreenShareInfo::~ScreenShareInfo() = default; - -bool DlpContentManager::ScreenShareInfo::operator==( - const DlpContentManager::ScreenShareInfo& other) const { +DlpContentManagerAsh::ScreenShareInfo::ScreenShareInfo( + const DlpContentManagerAsh::ScreenShareInfo& other) = default; +DlpContentManagerAsh::ScreenShareInfo& +DlpContentManagerAsh::ScreenShareInfo::operator=( + const DlpContentManagerAsh::ScreenShareInfo& other) = default; +DlpContentManagerAsh::ScreenShareInfo::~ScreenShareInfo() = default; + +bool DlpContentManagerAsh::ScreenShareInfo::operator==( + const DlpContentManagerAsh::ScreenShareInfo& other) const { return label_ == other.label_ && media_id_ == other.media_id_; } -bool DlpContentManager::ScreenShareInfo::operator!=( - const DlpContentManager::ScreenShareInfo& other) const { +bool DlpContentManagerAsh::ScreenShareInfo::operator!=( + const DlpContentManagerAsh::ScreenShareInfo& other) const { return !(*this == other); } -const content::DesktopMediaID& DlpContentManager::ScreenShareInfo::GetMediaId() - const { +const content::DesktopMediaID& +DlpContentManagerAsh::ScreenShareInfo::GetMediaId() const { return media_id_; } -const std::string& DlpContentManager::ScreenShareInfo::GetLabel() const { +const std::string& DlpContentManagerAsh::ScreenShareInfo::GetLabel() const { return label_; } -const std::u16string& DlpContentManager::ScreenShareInfo::GetApplicationTitle() - const { +const std::u16string& +DlpContentManagerAsh::ScreenShareInfo::GetApplicationTitle() const { // TODO(crbug.com/1264793): Don't cache the application name, but compute it // here. return application_title_; } -bool DlpContentManager::ScreenShareInfo::IsRunning() const { +bool DlpContentManagerAsh::ScreenShareInfo::IsRunning() const { return is_running_; } -void DlpContentManager::ScreenShareInfo::Pause() { +void DlpContentManagerAsh::ScreenShareInfo::Pause() { DCHECK(is_running_); state_change_callback_.Run(media_id_, blink::mojom::MediaStreamStateChange::PAUSE); is_running_ = false; } -void DlpContentManager::ScreenShareInfo::Resume() { +void DlpContentManagerAsh::ScreenShareInfo::Resume() { DCHECK(!is_running_); state_change_callback_.Run(media_id_, blink::mojom::MediaStreamStateChange::PLAY); is_running_ = true; } -void DlpContentManager::ScreenShareInfo::MaybeUpdateNotifications() { +void DlpContentManagerAsh::ScreenShareInfo::MaybeUpdateNotifications() { UpdatePausedNotification(/*show=*/!is_running_); UpdateResumedNotification(/*show=*/is_running_); } -void DlpContentManager::ScreenShareInfo::HideNotifications() { +void DlpContentManagerAsh::ScreenShareInfo::HideNotifications() { UpdatePausedNotification(/*show=*/false); UpdateResumedNotification(/*show=*/false); } -void DlpContentManager::ScreenShareInfo::UpdatePausedNotification(bool show) { +void DlpContentManagerAsh::ScreenShareInfo::UpdatePausedNotification( + bool show) { if ((notification_state_ == NotificationState::kShowingPausedNotification) == show) return; @@ -451,7 +453,8 @@ void DlpContentManager::ScreenShareInfo::UpdatePausedNotification(bool show) { } } -void DlpContentManager::ScreenShareInfo::UpdateResumedNotification(bool show) { +void DlpContentManagerAsh::ScreenShareInfo::UpdateResumedNotification( + bool show) { if ((notification_state_ == NotificationState::kShowingResumedNotification) == show) return; @@ -464,13 +467,13 @@ void DlpContentManager::ScreenShareInfo::UpdateResumedNotification(bool show) { } } -DlpContentManager::VideoCaptureInfo::VideoCaptureInfo( +DlpContentManagerAsh::VideoCaptureInfo::VideoCaptureInfo( const ScreenshotArea& area) : area(area) {} -DlpContentManager::DlpContentManager() = default; +DlpContentManagerAsh::DlpContentManagerAsh() = default; -void DlpContentManager::Init() { +void DlpContentManagerAsh::Init() { DlpRulesManager* rules_manager = DlpRulesManagerFactory::GetForPrimaryProfile(); if (rules_manager) @@ -479,9 +482,9 @@ void DlpContentManager::Init() { warn_notifier_ = std::make_unique(); } -DlpContentManager::~DlpContentManager() = default; +DlpContentManagerAsh::~DlpContentManagerAsh() = default; -void DlpContentManager::OnConfidentialityChanged( +void DlpContentManagerAsh::OnConfidentialityChanged( content::WebContents* web_contents, const DlpContentRestrictionSet& restriction_set) { if (restriction_set.IsEmpty()) { @@ -498,24 +501,24 @@ void DlpContentManager::OnConfidentialityChanged( CheckRunningScreenShares(); } -void DlpContentManager::OnWebContentsDestroyed( +void DlpContentManagerAsh::OnWebContentsDestroyed( content::WebContents* web_contents) { RemoveFromConfidential(web_contents); } -void DlpContentManager::OnVisibilityChanged( +void DlpContentManagerAsh::OnVisibilityChanged( content::WebContents* web_contents) { MaybeChangeOnScreenRestrictions(); } -void DlpContentManager::RemoveFromConfidential( +void DlpContentManagerAsh::RemoveFromConfidential( content::WebContents* web_contents) { confidential_web_contents_.erase(web_contents); web_contents_window_observers_.erase(web_contents); MaybeChangeOnScreenRestrictions(); } -void DlpContentManager::MaybeChangeOnScreenRestrictions() { +void DlpContentManagerAsh::MaybeChangeOnScreenRestrictions() { DlpContentRestrictionSet new_restriction_set; // Check each visible WebContents. for (const auto& entry : confidential_web_contents_) { @@ -541,7 +544,7 @@ void DlpContentManager::MaybeChangeOnScreenRestrictions() { CheckRunningScreenShares(); } -void DlpContentManager::OnScreenRestrictionsChanged( +void DlpContentManagerAsh::OnScreenRestrictionsChanged( const DlpContentRestrictionSet& added_restrictions, const DlpContentRestrictionSet& removed_restrictions) const { DCHECK(!(added_restrictions.GetRestrictionLevel( @@ -579,13 +582,14 @@ void DlpContentManager::OnScreenRestrictionsChanged( DlpRulesManager::Level::kBlock) { base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, - base::BindOnce(&DlpContentManager::MaybeRemovePrivacyScreenEnforcement, - base::Unretained(this)), + base::BindOnce( + &DlpContentManagerAsh::MaybeRemovePrivacyScreenEnforcement, + base::Unretained(this)), kPrivacyScreenOffDelay); } } -void DlpContentManager::MaybeRemovePrivacyScreenEnforcement() const { +void DlpContentManagerAsh::MaybeRemovePrivacyScreenEnforcement() const { if (GetOnScreenPresentRestrictions().GetRestrictionLevel( DlpContentRestriction::kPrivacyScreen) != DlpRulesManager::Level::kBlock) { @@ -594,10 +598,10 @@ void DlpContentManager::MaybeRemovePrivacyScreenEnforcement() const { } } -DlpContentManager::ConfidentialContentsInfo -DlpContentManager::GetConfidentialContentsOnScreen( +DlpContentManagerAsh::ConfidentialContentsInfo +DlpContentManagerAsh::GetConfidentialContentsOnScreen( DlpContentRestriction restriction) const { - DlpContentManager::ConfidentialContentsInfo info; + DlpContentManagerAsh::ConfidentialContentsInfo info; info.restriction_info = GetOnScreenPresentRestrictions().GetRestrictionLevelAndUrl(restriction); for (auto& entry : confidential_web_contents_) { @@ -611,11 +615,11 @@ DlpContentManager::GetConfidentialContentsOnScreen( return info; } -DlpContentManager::ConfidentialContentsInfo -DlpContentManager::GetAreaConfidentialContentsInfo( +DlpContentManagerAsh::ConfidentialContentsInfo +DlpContentManagerAsh::GetAreaConfidentialContentsInfo( const ScreenshotArea& area, DlpContentRestriction restriction) const { - DlpContentManager::ConfidentialContentsInfo info; + DlpContentManagerAsh::ConfidentialContentsInfo info; // Fullscreen - restricted if any confidential data is visible. if (area.type == ScreenshotType::kAllRootWindows) { return GetConfidentialContentsOnScreen(restriction); @@ -743,8 +747,8 @@ DlpContentManager::GetAreaConfidentialContentsInfo( return info; } -DlpContentManager::ConfidentialContentsInfo -DlpContentManager::GetScreenShareConfidentialContentsInfo( +DlpContentManagerAsh::ConfidentialContentsInfo +DlpContentManagerAsh::GetScreenShareConfidentialContentsInfo( const content::DesktopMediaID& media_id) const { if (media_id.type == content::DesktopMediaID::Type::TYPE_SCREEN) { return GetConfidentialContentsOnScreen(DlpContentRestriction::kScreenShare); @@ -810,7 +814,7 @@ DlpContentManager::GetScreenShareConfidentialContentsInfo( return info; } -void DlpContentManager::CheckRunningVideoCapture() { +void DlpContentManagerAsh::CheckRunningVideoCapture() { if (!running_video_capture_info_.has_value()) return; ConfidentialContentsInfo info = GetAreaConfidentialContentsInfo( @@ -836,7 +840,7 @@ void DlpContentManager::CheckRunningVideoCapture() { } } -void DlpContentManager::CheckRunningScreenShares() { +void DlpContentManagerAsh::CheckRunningScreenShares() { for (auto& screen_share : running_screen_shares_) { ConfidentialContentsInfo info = GetScreenShareConfidentialContentsInfo(screen_share.GetMediaId()); @@ -868,10 +872,10 @@ void DlpContentManager::CheckRunningScreenShares() { screen_share.Pause(); screen_share.HideNotifications(); } - // base::Unretained(this) is safe here because DlpContentManager is + // base::Unretained(this) is safe here because DlpContentManagerAsh is // initialized as a singleton that's always available in the system. warn_notifier_->ShowDlpScreenShareWarningDialog( - base::BindOnce(&DlpContentManager::OnDlpScreenShareWarnDialogReply, + base::BindOnce(&DlpContentManagerAsh::OnDlpScreenShareWarnDialogReply, base::Unretained(this), info.confidential_contents, screen_share), info.confidential_contents, screen_share.GetApplicationTitle()); @@ -886,27 +890,27 @@ void DlpContentManager::CheckRunningScreenShares() { } } -void DlpContentManager::SetReportingManagerForTesting( +void DlpContentManagerAsh::SetReportingManagerForTesting( DlpReportingManager* reporting_manager) { reporting_manager_ = reporting_manager; } -void DlpContentManager::SetWarnNotifierForTesting( +void DlpContentManagerAsh::SetWarnNotifierForTesting( std::unique_ptr warn_notifier) { DCHECK(warn_notifier); warn_notifier_ = std::move(warn_notifier); } -void DlpContentManager::ResetWarnNotifierForTesting() { +void DlpContentManagerAsh::ResetWarnNotifierForTesting() { warn_notifier_ = std::make_unique(); } // static -base::TimeDelta DlpContentManager::GetPrivacyScreenOffDelayForTesting() { +base::TimeDelta DlpContentManagerAsh::GetPrivacyScreenOffDelayForTesting() { return kPrivacyScreenOffDelay; } -RestrictionLevelAndUrl DlpContentManager::GetPrintingRestrictionInfo( +RestrictionLevelAndUrl DlpContentManagerAsh::GetPrintingRestrictionInfo( content::WebContents* web_contents) const { // If we're viewing the PDF in a MimeHandlerViewGuest, use its embedded // WebContents. @@ -919,7 +923,7 @@ RestrictionLevelAndUrl DlpContentManager::GetPrintingRestrictionInfo( .GetRestrictionLevelAndUrl(DlpContentRestriction::kPrint); } -void DlpContentManager::CheckScreenCaptureRestriction( +void DlpContentManagerAsh::CheckScreenCaptureRestriction( ConfidentialContentsInfo info, ash::OnCaptureModeDlpRestrictionChecked callback) { if (IsBlocked(info.restriction_info)) { @@ -937,10 +941,10 @@ void DlpContentManager::CheckScreenCaptureRestriction( std::move(callback).Run(true); return; } - // base::Unretained(this) is safe here because DlpContentManager is + // base::Unretained(this) is safe here because DlpContentManagerAsh is // initialized as a singleton that's always available in the system. warn_notifier_->ShowDlpScreenCaptureWarningDialog( - base::BindOnce(&DlpContentManager::OnDlpWarnDialogReply, + base::BindOnce(&DlpContentManagerAsh::OnDlpWarnDialogReply, base::Unretained(this), info.confidential_contents, DlpRulesManager::Restriction::kScreenshot, std::move(callback)), @@ -951,7 +955,7 @@ void DlpContentManager::CheckScreenCaptureRestriction( std::move(callback).Run(true); } -void DlpContentManager::OnDlpScreenShareWarnDialogReply( +void DlpContentManagerAsh::OnDlpScreenShareWarnDialogReply( const DlpConfidentialContents& confidential_contents, ScreenShareInfo screen_share, bool should_proceed) { @@ -968,7 +972,7 @@ void DlpContentManager::OnDlpScreenShareWarnDialogReply( screen_share.MaybeUpdateNotifications(); } -void DlpContentManager::OnDlpWarnDialogReply( +void DlpContentManagerAsh::OnDlpWarnDialogReply( const DlpConfidentialContents& confidential_contents, DlpRulesManager::Restriction restriction, OnDlpRestrictionCheckedCallback callback, @@ -981,7 +985,7 @@ void DlpContentManager::OnDlpWarnDialogReply( std::move(callback).Run(should_proceed); } -void DlpContentManager::MaybeReportEvent( +void DlpContentManagerAsh::MaybeReportEvent( const RestrictionLevelAndUrl& restriction_info, DlpRulesManager::Restriction restriction) { // TODO(crbug.com/1260302): Add reporting and metrics for WARN restrictions. @@ -991,7 +995,7 @@ void DlpContentManager::MaybeReportEvent( } } -void DlpContentManager::ReportWarningEvent( +void DlpContentManagerAsh::ReportWarningEvent( const RestrictionLevelAndUrl& restriction_info, DlpRulesManager::Restriction restriction) { DCHECK(IsWarn(restriction_info)); @@ -1001,7 +1005,7 @@ void DlpContentManager::ReportWarningEvent( } } -void DlpContentManager::RemoveAllowedContents( +void DlpContentManagerAsh::RemoveAllowedContents( DlpConfidentialContents& contents, DlpRulesManager::Restriction restriction) { base::EraseIf( @@ -1010,14 +1014,15 @@ void DlpContentManager::RemoveAllowedContents( }); } -// ScopedDlpContentManagerForTesting -ScopedDlpContentManagerForTesting::ScopedDlpContentManagerForTesting( - DlpContentManager* test_dlp_content_manager) { - DlpContentManager::SetDlpContentManagerForTesting(test_dlp_content_manager); +// ScopedDlpContentManagerAshForTesting +ScopedDlpContentManagerAshForTesting::ScopedDlpContentManagerAshForTesting( + DlpContentManagerAsh* test_dlp_content_manager) { + DlpContentManagerAsh::SetDlpContentManagerAshForTesting( + test_dlp_content_manager); } -ScopedDlpContentManagerForTesting::~ScopedDlpContentManagerForTesting() { - DlpContentManager::ResetDlpContentManagerForTesting(); +ScopedDlpContentManagerAshForTesting::~ScopedDlpContentManagerAshForTesting() { + DlpContentManagerAsh::ResetDlpContentManagerAshForTesting(); } } // namespace policy diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager.h b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h similarity index 92% rename from chrome/browser/ash/policy/dlp/dlp_content_manager.h rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h index f96feb8aae6485..9e8acda1f0fd95 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager.h +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_H_ -#define CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_H_ +#ifndef CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_H_ +#define CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_H_ #include #include @@ -46,15 +46,15 @@ class DlpWarnNotifier; // WebContents and whether any of them are currently visible. // If any confidential WebContents is visible, the corresponding restrictions // will be enforced according to the current enterprise policy. -class DlpContentManager : public DlpContentObserver, - public DlpWindowObserver::Delegate { +class DlpContentManagerAsh : public DlpContentObserver, + public DlpWindowObserver::Delegate { public: - DlpContentManager(const DlpContentManager&) = delete; - DlpContentManager& operator=(const DlpContentManager&) = delete; + DlpContentManagerAsh(const DlpContentManagerAsh&) = delete; + DlpContentManagerAsh& operator=(const DlpContentManagerAsh&) = delete; // Creates the instance if not yet created. // There will always be a single instance created on the first access. - static DlpContentManager* Get(); + static DlpContentManagerAsh* Get(); // DlpWindowObserver::Delegate overrides: void OnWindowOcclusionChanged(aura::Window* window) override; @@ -144,11 +144,11 @@ class DlpContentManager : public DlpContentObserver, // The caller (test) should manage |dlp_content_manager| lifetime. // Reset doesn't delete the object. - // Please use ScopedDlpContentManagerForTesting instead of these methods, + // Please use ScopedDlpContentManagerAshForTesting instead of these methods, // if possible. - static void SetDlpContentManagerForTesting( - DlpContentManager* dlp_content_manager); - static void ResetDlpContentManagerForTesting(); + static void SetDlpContentManagerAshForTesting( + DlpContentManagerAsh* dlp_content_manager); + static void ResetDlpContentManagerAshForTesting(); protected: void SetReportingManagerForTesting(DlpReportingManager* manager); @@ -158,9 +158,9 @@ class DlpContentManager : public DlpContentObserver, void ResetWarnNotifierForTesting(); private: - friend class DlpContentManagerTestHelper; + friend class DlpContentManagerAshTestHelper; friend class DlpContentTabHelper; - friend class MockDlpContentManager; + friend class MockDlpContentManagerAsh; // Used to keep track of running screen shares. class ScreenShareInfo { @@ -239,8 +239,8 @@ class DlpContentManager : public DlpContentObserver, DlpConfidentialContents confidential_contents; }; - DlpContentManager(); - ~DlpContentManager() override; + DlpContentManagerAsh(); + ~DlpContentManagerAsh() override; // Initializing to be called separately to make testing possible. virtual void Init(); @@ -378,17 +378,17 @@ class DlpContentManager : public DlpContentObserver, const bool is_screen_share_warning_mode_enabled_ = false; }; -// Helper class to call SetDlpContentManagerForTesting and -// ResetDlpContentManagerForTesting automically. +// Helper class to call SetDlpContentManagerAshForTesting and +// ResetDlpContentManagerAshForTesting automically. // The caller (test) should manage `test_dlp_content_manager` lifetime. // This class does not own it. -class ScopedDlpContentManagerForTesting { +class ScopedDlpContentManagerAshForTesting { public: - explicit ScopedDlpContentManagerForTesting( - DlpContentManager* test_dlp_content_manager); - ~ScopedDlpContentManagerForTesting(); + explicit ScopedDlpContentManagerAshForTesting( + DlpContentManagerAsh* test_dlp_content_manager); + ~ScopedDlpContentManagerAshForTesting(); }; } // namespace policy -#endif // CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_H_ +#endif // CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_H_ diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_browsertest.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc similarity index 95% rename from chrome/browser/ash/policy/dlp/dlp_content_manager_browsertest.cc rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc index f5941225d965d4..b24a12aa8c7ad6 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_browsertest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include @@ -13,7 +13,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/test_future.h" #include "base/threading/sequenced_task_runner_handle.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h" #include "chrome/browser/chromeos/policy/dlp/dlp_histogram_helper.h" #include "chrome/browser/chromeos/policy/dlp/dlp_policy_event.pb.h" #include "chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.h" @@ -87,10 +87,10 @@ constexpr char kGoogleUrl[] = "https://google.com"; constexpr char kSrcPattern[] = "example.com"; } // namespace -class DlpContentManagerBrowserTest : public InProcessBrowserTest { +class DlpContentManagerAshBrowserTest : public InProcessBrowserTest { public: - DlpContentManagerBrowserTest() = default; - ~DlpContentManagerBrowserTest() override = default; + DlpContentManagerAshBrowserTest() = default; + ~DlpContentManagerAshBrowserTest() override = default; std::unique_ptr SetDlpRulesManager( content::BrowserContext* context) { @@ -100,10 +100,10 @@ class DlpContentManagerBrowserTest : public InProcessBrowserTest { } void SetUpOnMainThread() override { - // Instantiate |DlpContentManagerTestHelper| after main thread has been set - // up cause |DlpReportingManager| needs a sequenced task runner handle to - // set up the report queue. - helper_ = std::make_unique(); + // Instantiate |DlpContentManagerAshTestHelper| after main thread has been + // set up cause |DlpReportingManager| needs a sequenced task runner handle + // to set up the report queue. + helper_ = std::make_unique(); } void TearDownOnMainThread() override { helper_.reset(); } @@ -112,8 +112,9 @@ class DlpContentManagerBrowserTest : public InProcessBrowserTest { void SetupDlpRulesManager() { DlpRulesManagerFactory::GetInstance()->SetTestingFactory( browser()->profile(), - base::BindRepeating(&DlpContentManagerBrowserTest::SetDlpRulesManager, - base::Unretained(this))); + base::BindRepeating( + &DlpContentManagerAshBrowserTest::SetDlpRulesManager, + base::Unretained(this))); ASSERT_TRUE(DlpRulesManagerFactory::GetForPrimaryProfile()); EXPECT_CALL(*mock_rules_manager_, GetSourceUrlPattern(_, _, _)) @@ -140,7 +141,7 @@ class DlpContentManagerBrowserTest : public InProcessBrowserTest { } protected: - std::unique_ptr helper_; + std::unique_ptr helper_; base::HistogramTester histogram_tester_; MockDlpRulesManager* mock_rules_manager_; @@ -148,9 +149,9 @@ class DlpContentManagerBrowserTest : public InProcessBrowserTest { std::vector events_; }; -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsRestricted) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, ScreenshotsRestricted) { SetupReporting(); - DlpContentManager* manager = helper_->GetContentManager(); + DlpContentManagerAsh* manager = helper_->GetContentManager(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -230,8 +231,8 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsRestricted) { DlpRulesManager::Level::kBlock, 7u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsWarned) { - DlpContentManager* manager = helper_->GetContentManager(); +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, ScreenshotsWarned) { + DlpContentManagerAsh* manager = helper_->GetContentManager(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -281,9 +282,9 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsWarned) { EXPECT_FALSE(manager->IsScreenshotApiRestricted(partial_out)); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsReported) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, ScreenshotsReported) { SetupReporting(); - DlpContentManager* manager = helper_->GetContentManager(); + DlpContentManagerAsh* manager = helper_->GetContentManager(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -347,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenshotsReported) { DlpRulesManager::Level::kReport, 7u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, VideoCaptureStoppedWhenConfidentialWindowResized) { SetupReporting(); aura::Window* root_window = @@ -396,7 +397,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, DlpRulesManager::Level::kBlock, 1u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, VideoCaptureReported) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, VideoCaptureReported) { SetupReporting(); aura::Window* root_window = browser()->window()->GetNativeWindow()->GetRootWindow(); @@ -444,7 +445,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, VideoCaptureReported) { DlpRulesManager::Level::kReport, 1u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, VideoCaptureStoppedWhenNonConfidentialWindowResized) { SetupReporting(); aura::Window* root_window = @@ -493,7 +494,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, DlpRulesManager::Level::kBlock, 1u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, VideoCaptureNotStoppedWhenConfidentialWindowHidden) { SetupReporting(); aura::Window* root_window = @@ -542,10 +543,11 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, DlpRulesManager::Level::kBlock, 0u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenShareNotification) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, + ScreenShareNotification) { SetupReporting(); NotificationDisplayServiceTester display_service_tester(browser()->profile()); - DlpContentManager* manager = helper_->GetContentManager(); + DlpContentManagerAsh* manager = helper_->GetContentManager(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -603,11 +605,11 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenShareNotification) { DlpRulesManager::Level::kBlock, 1u); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, ScreenShareDisabledNotification) { SetupReporting(); NotificationDisplayServiceTester display_service_tester(browser()->profile()); - DlpContentManager* manager = helper_->GetContentManager(); + DlpContentManagerAsh* manager = helper_->GetContentManager(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -639,7 +641,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, // Starting screen sharing and navigating other tabs should create exactly one // reporting event. -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenShareReporting) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, ScreenShareReporting) { SetupReporting(); const GURL origin(kExampleUrl); NotificationDisplayServiceTester display_service_tester(browser()->profile()); @@ -718,7 +720,7 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, ScreenShareReporting) { kScreenShareBlockedNotificationId)); } -IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, PrintingNotRestricted) { +IN_PROC_BROWSER_TEST_F(DlpContentManagerAshBrowserTest, PrintingNotRestricted) { // Set up mock report queue and mock rules manager. SetupReporting(); ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kExampleUrl))); @@ -752,10 +754,10 @@ IN_PROC_BROWSER_TEST_F(DlpContentManagerBrowserTest, PrintingNotRestricted) { } class DlpContentManagerReportingBrowserTest - : public DlpContentManagerBrowserTest { + : public DlpContentManagerAshBrowserTest { public: void SetUpOnMainThread() override { - DlpContentManagerBrowserTest::SetUpOnMainThread(); + DlpContentManagerAshBrowserTest::SetUpOnMainThread(); content::WebContents* first_tab = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(first_tab); @@ -774,7 +776,7 @@ class DlpContentManagerReportingBrowserTest } void TearDownOnMainThread() override { - DlpContentManagerBrowserTest::TearDownOnMainThread(); + DlpContentManagerAshBrowserTest::TearDownOnMainThread(); cloned_tab_observer_.reset(); } diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.cc similarity index 60% rename from chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.cc rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.cc index 1f0d9de214b61e..7e6b4176eb29b1 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.cc @@ -2,60 +2,60 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h" #include -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.h" #include "chrome/browser/chromeos/policy/dlp/dlp_warn_notifier.h" namespace policy { -DlpContentManagerTestHelper::DlpContentManagerTestHelper() { - manager_ = new DlpContentManager(); +DlpContentManagerAshTestHelper::DlpContentManagerAshTestHelper() { + manager_ = new DlpContentManagerAsh(); DCHECK(manager_); reporting_manager_ = new DlpReportingManager(); DCHECK(reporting_manager_); manager_->SetReportingManagerForTesting(reporting_manager_); - DlpContentManager::SetDlpContentManagerForTesting(manager_); + DlpContentManagerAsh::SetDlpContentManagerAshForTesting(manager_); } -DlpContentManagerTestHelper::~DlpContentManagerTestHelper() { +DlpContentManagerAshTestHelper::~DlpContentManagerAshTestHelper() { delete reporting_manager_; } -void DlpContentManagerTestHelper::ChangeConfidentiality( +void DlpContentManagerAshTestHelper::ChangeConfidentiality( content::WebContents* web_contents, const DlpContentRestrictionSet& restrictions) { DCHECK(manager_); manager_->OnConfidentialityChanged(web_contents, restrictions); } -void DlpContentManagerTestHelper::ChangeVisibility( +void DlpContentManagerAshTestHelper::ChangeVisibility( content::WebContents* web_contents) { DCHECK(manager_); manager_->OnVisibilityChanged(web_contents); } -void DlpContentManagerTestHelper::DestroyWebContents( +void DlpContentManagerAshTestHelper::DestroyWebContents( content::WebContents* web_contents) { DCHECK(manager_); manager_->OnWebContentsDestroyed(web_contents); } -void DlpContentManagerTestHelper::SetWarnNotifierForTesting( +void DlpContentManagerAshTestHelper::SetWarnNotifierForTesting( std::unique_ptr notifier) { DCHECK(manager_); manager_->SetWarnNotifierForTesting(std::move(notifier)); } -void DlpContentManagerTestHelper::ResetWarnNotifierForTesting() { +void DlpContentManagerAshTestHelper::ResetWarnNotifierForTesting() { DCHECK(manager_); manager_->ResetWarnNotifierForTesting(); } -bool DlpContentManagerTestHelper::HasContentCachedForRestriction( +bool DlpContentManagerAshTestHelper::HasContentCachedForRestriction( content::WebContents* web_contents, DlpRulesManager::Restriction restriction) const { DCHECK(manager_); @@ -63,21 +63,24 @@ bool DlpContentManagerTestHelper::HasContentCachedForRestriction( restriction); } -bool DlpContentManagerTestHelper::HasAnyContentCached() const { +bool DlpContentManagerAshTestHelper::HasAnyContentCached() const { DCHECK(manager_); return manager_->user_allowed_contents_cache_.GetSizeForTesting() != 0; } -base::TimeDelta DlpContentManagerTestHelper::GetPrivacyScreenOffDelay() const { +base::TimeDelta DlpContentManagerAshTestHelper::GetPrivacyScreenOffDelay() + const { DCHECK(manager_); return manager_->GetPrivacyScreenOffDelayForTesting(); } -DlpContentManager* DlpContentManagerTestHelper::GetContentManager() const { +DlpContentManagerAsh* DlpContentManagerAshTestHelper::GetContentManager() + const { return manager_; } -DlpReportingManager* DlpContentManagerTestHelper::GetReportingManager() const { +DlpReportingManager* DlpContentManagerAshTestHelper::GetReportingManager() + const { return manager_->reporting_manager_; } diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h similarity index 69% rename from chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h index 5aa77a30e9daea..03b3e65726bf30 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_TEST_HELPER_H_ -#define CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_TEST_HELPER_H_ +#ifndef CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_TEST_HELPER_H_ +#define CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_TEST_HELPER_H_ #include #include "base/time/time.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_contents.h" #include "chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set.h" #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h" @@ -20,12 +20,12 @@ namespace policy { class DlpReportingManager; -// This class is an interface to DlpContentManager and is used in tests to +// This class is an interface to DlpContentManagerAsh and is used in tests to // access some of its private methods. -class DlpContentManagerTestHelper { +class DlpContentManagerAshTestHelper { public: - DlpContentManagerTestHelper(); - ~DlpContentManagerTestHelper(); + DlpContentManagerAshTestHelper(); + ~DlpContentManagerAshTestHelper(); void ChangeConfidentiality(content::WebContents* web_contents, const DlpContentRestrictionSet& restrictions); @@ -46,14 +46,14 @@ class DlpContentManagerTestHelper { base::TimeDelta GetPrivacyScreenOffDelay() const; - DlpContentManager* GetContentManager() const; + DlpContentManagerAsh* GetContentManager() const; DlpReportingManager* GetReportingManager() const; private: - DlpContentManager* manager_; + DlpContentManagerAsh* manager_; DlpReportingManager* reporting_manager_; }; } // namespace policy -#endif // CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_TEST_HELPER_H_ +#endif // CHROME_BROWSER_ASH_POLICY_DLP_DLP_CONTENT_MANAGER_ASH_TEST_HELPER_H_ diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_unittest.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc similarity index 95% rename from chrome/browser/ash/policy/dlp/dlp_content_manager_unittest.cc rename to chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc index e1496fadc88c1e..3239cc2e078952 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_unittest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include @@ -14,7 +14,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h" #include "chrome/browser/chromeos/policy/dlp/dlp_histogram_helper.h" #include "chrome/browser/chromeos/policy/dlp/dlp_policy_event.pb.h" #include "chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.h" @@ -90,10 +90,10 @@ auto on_dlp_restriction_checked_callback = [](absl::optional* out_result, } // namespace -class DlpContentManagerTest : public testing::Test { +class DlpContentManagerAshTest : public testing::Test { public: - DlpContentManagerTest(const DlpContentManagerTest&) = delete; - DlpContentManagerTest& operator=(const DlpContentManagerTest&) = delete; + DlpContentManagerAshTest(const DlpContentManagerAshTest&) = delete; + DlpContentManagerAshTest& operator=(const DlpContentManagerAshTest&) = delete; std::unique_ptr SetDlpRulesManager( content::BrowserContext* context) { @@ -103,11 +103,11 @@ class DlpContentManagerTest : public testing::Test { } protected: - DlpContentManagerTest() + DlpContentManagerAshTest() : profile_manager_(TestingBrowserProcess::GetGlobal()), user_manager_(new ash::FakeChromeUserManager()), scoped_user_manager_(base::WrapUnique(user_manager_)) {} - ~DlpContentManagerTest() override = default; + ~DlpContentManagerAshTest() override = default; std::unique_ptr CreateWebContents() { return content::WebContentsTester::CreateTestWebContents(profile_, nullptr); @@ -146,18 +146,18 @@ class DlpContentManagerTest : public testing::Test { void SetupDlpRulesManager() { DlpRulesManagerFactory::GetInstance()->SetTestingFactory( profile(), - base::BindRepeating(&DlpContentManagerTest::SetDlpRulesManager, + base::BindRepeating(&DlpContentManagerAshTest::SetDlpRulesManager, base::Unretained(this))); ASSERT_TRUE(DlpRulesManagerFactory::GetForPrimaryProfile()); } - DlpContentManager* GetManager() { return helper_.GetContentManager(); } + DlpContentManagerAsh* GetManager() { return helper_.GetContentManager(); } TestingProfile* profile() { return profile_; } content::BrowserTaskEnvironment task_environment_{ base::test::TaskEnvironment::TimeSource::MOCK_TIME}; - DlpContentManagerTestHelper helper_; + DlpContentManagerAshTestHelper helper_; base::HistogramTester histogram_tester_; std::vector events_; MockDlpRulesManager* mock_rules_manager_ = nullptr; @@ -185,7 +185,7 @@ class DlpContentManagerTest : public testing::Test { user_manager::ScopedUserManager scoped_user_manager_; }; -TEST_F(DlpContentManagerTest, NoConfidentialDataShown) { +TEST_F(DlpContentManagerAshTest, NoConfidentialDataShown) { std::unique_ptr web_contents = CreateWebContents(); EXPECT_EQ(GetManager()->GetConfidentialRestrictions(web_contents.get()), kEmptyRestrictionSet); @@ -193,7 +193,7 @@ TEST_F(DlpContentManagerTest, NoConfidentialDataShown) { kEmptyRestrictionSet); } -TEST_F(DlpContentManagerTest, ConfidentialDataShown) { +TEST_F(DlpContentManagerAshTest, ConfidentialDataShown) { std::unique_ptr web_contents = CreateWebContents(); EXPECT_EQ(GetManager()->GetConfidentialRestrictions(web_contents.get()), kEmptyRestrictionSet); @@ -213,7 +213,7 @@ TEST_F(DlpContentManagerTest, ConfidentialDataShown) { kEmptyRestrictionSet); } -TEST_F(DlpContentManagerTest, ConfidentialDataVisibilityChanged) { +TEST_F(DlpContentManagerAshTest, ConfidentialDataVisibilityChanged) { std::unique_ptr web_contents = CreateWebContents(); EXPECT_EQ(GetManager()->GetConfidentialRestrictions(web_contents.get()), kEmptyRestrictionSet); @@ -247,7 +247,7 @@ TEST_F(DlpContentManagerTest, ConfidentialDataVisibilityChanged) { kEmptyRestrictionSet); } -TEST_F(DlpContentManagerTest, +TEST_F(DlpContentManagerAshTest, TwoWebContentsVisibilityAndConfidentialityChanged) { std::unique_ptr web_contents1 = CreateWebContents(); std::unique_ptr web_contents2 = CreateWebContents(); @@ -313,7 +313,7 @@ TEST_F(DlpContentManagerTest, kEmptyRestrictionSet); } -TEST_F(DlpContentManagerTest, PrivacyScreenEnforcement) { +TEST_F(DlpContentManagerAshTest, PrivacyScreenEnforcement) { SetReportQueueForReportingManager(); SetupDlpRulesManager(); const std::string src_pattern("example.com"); @@ -379,7 +379,7 @@ TEST_F(DlpContentManagerTest, PrivacyScreenEnforcement) { EXPECT_EQ(events_.size(), 2u); } -TEST_F(DlpContentManagerTest, PrivacyScreenReported) { +TEST_F(DlpContentManagerAshTest, PrivacyScreenReported) { SetReportQueueForReportingManager(); SetupDlpRulesManager(); const std::string src_pattern("example.com"); @@ -421,7 +421,7 @@ TEST_F(DlpContentManagerTest, PrivacyScreenReported) { EXPECT_EQ(events_.size(), 2u); } -TEST_F(DlpContentManagerTest, +TEST_F(DlpContentManagerAshTest, PrivacyScreenNotEnforcedAndReportedOnUnsupportedDevice) { SetReportQueueForReportingManager(); SetupDlpRulesManager(); @@ -450,18 +450,19 @@ TEST_F(DlpContentManagerTest, helper_.DestroyWebContents(web_contents.get()); } -class DlpContentManagerCheckRestrictionTest : public DlpContentManagerTest { +class DlpContentManagerAshCheckRestrictionTest + : public DlpContentManagerAshTest { public: - DlpContentManagerCheckRestrictionTest( - const DlpContentManagerCheckRestrictionTest&) = delete; - DlpContentManagerCheckRestrictionTest& operator=( - const DlpContentManagerCheckRestrictionTest&) = delete; + DlpContentManagerAshCheckRestrictionTest( + const DlpContentManagerAshCheckRestrictionTest&) = delete; + DlpContentManagerAshCheckRestrictionTest& operator=( + const DlpContentManagerAshCheckRestrictionTest&) = delete; protected: - DlpContentManagerCheckRestrictionTest() = default; + DlpContentManagerAshCheckRestrictionTest() = default; void SetUp() override { - DlpContentManagerTest::SetUp(); + DlpContentManagerAshTest::SetUp(); SetReportQueueForReportingManager(); SetupDlpRulesManager(); @@ -493,7 +494,7 @@ class DlpContentManagerCheckRestrictionTest : public DlpContentManagerTest { absl::optional is_action_allowed_; }; -TEST_F(DlpContentManagerCheckRestrictionTest, PrintingRestricted) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, PrintingRestricted) { // Needs to be set because CheckPrintingRestriction() will show the blocked // notification. NotificationDisplayServiceTester display_service_tester(profile()); @@ -548,7 +549,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, PrintingRestricted) { GetDlpHistogramPrefix() + dlp::kPrintingBlockedUMA, false, 2); } -TEST_F(DlpContentManagerCheckRestrictionTest, PrintingWarnedContinued) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, PrintingWarnedContinued) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(true /*should_proceed*/); @@ -617,7 +618,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, PrintingWarnedContinued) { EXPECT_EQ(events_.size(), 3u); } -TEST_F(DlpContentManagerCheckRestrictionTest, PrintingWarnedCancelled) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, PrintingWarnedCancelled) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(false /*should_proceed*/); @@ -680,7 +681,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, PrintingWarnedCancelled) { EXPECT_EQ(events_.size(), 2u); } -TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitRestricted) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, CaptureModeInitRestricted) { // Needs to be set because CheckCaptureModeInitRestriction() will show the // blocked notification. NotificationDisplayServiceTester display_service_tester(profile()); @@ -731,7 +732,8 @@ TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitRestricted) { GetDlpHistogramPrefix() + dlp::kCaptureModeInitBlockedUMA, false, 2); } -TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitWarnedContinued) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, + CaptureModeInitWarnedContinued) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(true /*should_proceed*/); @@ -774,7 +776,8 @@ TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitWarnedContinued) { VerifyAndResetActionAllowed(true /*expected*/); } -TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitWarnedCancelled) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, + CaptureModeInitWarnedCancelled) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(false /*should_proceed*/); @@ -816,7 +819,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, CaptureModeInitWarnedCancelled) { VerifyAndResetActionAllowed(true /*expected*/); } -TEST_F(DlpContentManagerCheckRestrictionTest, ScreenshotRestricted) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, ScreenshotRestricted) { // Needs to be set because CheckScreenshotRestriction() will show the blocked // notification. NotificationDisplayServiceTester display_service_tester(profile()); @@ -872,7 +875,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, ScreenshotRestricted) { GetDlpHistogramPrefix() + dlp::kScreenshotBlockedUMA, false, 2); } -TEST_F(DlpContentManagerCheckRestrictionTest, ScreenshotWarnedContinued) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, ScreenshotWarnedContinued) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(true /*should_proceed*/); @@ -921,7 +924,7 @@ TEST_F(DlpContentManagerCheckRestrictionTest, ScreenshotWarnedContinued) { VerifyAndResetActionAllowed(true /*expected*/); } -TEST_F(DlpContentManagerCheckRestrictionTest, ScreenshotWarnedCancelled) { +TEST_F(DlpContentManagerAshCheckRestrictionTest, ScreenshotWarnedCancelled) { // Set the notifier to "Proceed" on the warning. MockDlpWarnNotifier* mock_dlp_warn_notifier = CreateAndSetDlpWarnNotifier(false /*should_proceed*/); diff --git a/chrome/browser/ash/policy/dlp/mock_dlp_content_manager.cc b/chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.cc similarity index 75% rename from chrome/browser/ash/policy/dlp/mock_dlp_content_manager.cc rename to chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.cc index fddc9567209800..bc3c0a8f064293 100644 --- a/chrome/browser/ash/policy/dlp/mock_dlp_content_manager.cc +++ b/chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.h" namespace policy { -MockDlpContentManager::MockDlpContentManager() = default; +MockDlpContentManagerAsh::MockDlpContentManagerAsh() = default; -MockDlpContentManager::~MockDlpContentManager() = default; +MockDlpContentManagerAsh::~MockDlpContentManagerAsh() = default; -void MockDlpContentManager::Init() { +void MockDlpContentManagerAsh::Init() { SetReportingManagerForTesting(new DlpReportingManager()); ON_CALL(*this, CheckScreenShareRestriction) diff --git a/chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h b/chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h similarity index 79% rename from chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h rename to chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h index f8ba398a3a451b..8f736344e2cb33 100644 --- a/chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h +++ b/chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_H_ -#define CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_H_ +#ifndef CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_ASH_H_ +#define CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_ASH_H_ #include "base/callback_forward.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "testing/gmock/include/gmock/gmock.h" #include "url/gurl.h" namespace policy { -class MockDlpContentManager : public DlpContentManager { +class MockDlpContentManagerAsh : public DlpContentManagerAsh { public: - MockDlpContentManager(); - ~MockDlpContentManager() override; + MockDlpContentManagerAsh(); + ~MockDlpContentManagerAsh() override; MOCK_METHOD(void, OnConfidentialityChanged, @@ -47,4 +47,4 @@ class MockDlpContentManager : public DlpContentManager { } // namespace policy -#endif // CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_H_ +#endif // CHROME_BROWSER_ASH_POLICY_DLP_MOCK_DLP_CONTENT_MANAGER_ASH_H_ diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 9bc7289d3ee7a9..21d897ac3f11e5 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -2452,8 +2452,8 @@ source_set("chromeos") { "../ash/policy/display/display_rotation_default_handler.h", "../ash/policy/display/display_settings_handler.cc", "../ash/policy/display/display_settings_handler.h", - "../ash/policy/dlp/dlp_content_manager.cc", - "../ash/policy/dlp/dlp_content_manager.h", + "../ash/policy/dlp/dlp_content_manager_ash.cc", + "../ash/policy/dlp/dlp_content_manager_ash.h", "../ash/policy/dlp/dlp_notification_helper.cc", "../ash/policy/dlp/dlp_notification_helper.h", "../ash/policy/dlp/dlp_window_observer.cc", @@ -3783,8 +3783,8 @@ static_library("test_support") { "../ash/plugin_vm/fake_plugin_vm_features.h", "../ash/policy/core/user_policy_test_helper.cc", "../ash/policy/core/user_policy_test_helper.h", - "../ash/policy/dlp/dlp_content_manager_test_helper.cc", - "../ash/policy/dlp/dlp_content_manager_test_helper.h", + "../ash/policy/dlp/dlp_content_manager_ash_test_helper.cc", + "../ash/policy/dlp/dlp_content_manager_ash_test_helper.h", "../ash/policy/handlers/fake_device_name_policy_handler.cc", "../ash/policy/handlers/fake_device_name_policy_handler.h", "../ash/policy/handlers/minimum_version_policy_test_helpers.cc", @@ -4344,9 +4344,9 @@ source_set("unit_tests") { "../ash/policy/core/user_cloud_policy_manager_ash_unittest.cc", "../ash/policy/core/user_cloud_policy_store_ash_unittest.cc", "../ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc", - "../ash/policy/dlp/dlp_content_manager_unittest.cc", - "../ash/policy/dlp/mock_dlp_content_manager.cc", - "../ash/policy/dlp/mock_dlp_content_manager.h", + "../ash/policy/dlp/dlp_content_manager_ash_unittest.cc", + "../ash/policy/dlp/mock_dlp_content_manager_ash.cc", + "../ash/policy/dlp/mock_dlp_content_manager_ash.h", "../ash/policy/enrollment/account_status_check_fetcher_unittest.cc", "../ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc", "../ash/policy/enrollment/device_cloud_policy_initializer_unittest.cc", diff --git a/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc b/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc index 1f964abfa20ee3..dbfe9f03433054 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc @@ -118,25 +118,53 @@ IN_PROC_BROWSER_TEST_P(TelemetryExtensionBrowserTest, EXPECT_EQ("done", listener.message()); } +INSTANTIATE_TEST_SUITE_P( + All, + TelemetryExtensionBrowserTest, + testing::Combine( + testing::Bool(), + testing::ValuesIn( + BaseTelemetryExtensionBrowserTest::kAllExtensionInfoTestParams))); + +namespace { + +constexpr char kPwaOriginOverride[] = "*://pwa.website.com/*"; +constexpr char kPwaPageUrl[] = "http://pwa.website.com"; + +} // namespace + +class TelemetryExtensionCapabilitiesWithCmdBrowserTest + : public BaseTelemetryExtensionBrowserTest { + public: + TelemetryExtensionCapabilitiesWithCmdBrowserTest() = default; + TelemetryExtensionCapabilitiesWithCmdBrowserTest( + const TelemetryExtensionCapabilitiesWithCmdBrowserTest&) = delete; + TelemetryExtensionCapabilitiesWithCmdBrowserTest& operator=( + const TelemetryExtensionCapabilitiesWithCmdBrowserTest&) = delete; + ~TelemetryExtensionCapabilitiesWithCmdBrowserTest() override = default; + + // extensions::ExtensionBrowserTest: + void SetUpCommandLine(base::CommandLine* command_line) override { + extensions::ExtensionBrowserTest::SetUpCommandLine(command_line); + + command_line->AppendSwitchASCII( + chromeos::switches::kTelemetryExtensionPwaOriginOverrideForTesting, + kPwaOriginOverride); + } +}; + // Tests that the extension's PWA origin is overridden in tests using the // command line switch |kTelemetryExtensionPwaOriginOverrideForTesting|. The // test also makes sure the command line switch is copied across processes. -IN_PROC_BROWSER_TEST_P(TelemetryExtensionBrowserTest, - DISABLED_CanOverridePwaOriginForTesting) { - constexpr char kPwaOriginOverride[] = "*://pwa.website.com/*"; - - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( - chromeos::switches::kTelemetryExtensionPwaOriginOverrideForTesting, - kPwaOriginOverride); - +IN_PROC_BROWSER_TEST_P(TelemetryExtensionCapabilitiesWithCmdBrowserTest, + CanOverridePwaOriginForTesting) { // Make sure the PWA origin is overridden. const auto extension_info = GetChromeOSExtensionInfoForId(extension_info_params().extension_id); EXPECT_EQ(kPwaOriginOverride, extension_info.pwa_origin); // Open the PWA page url to bypass IsPwaUiOpen() check. - ASSERT_TRUE( - ui_test_utils::NavigateToURL(browser(), GURL("http://pwa.website.com"))); + ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), GURL(kPwaPageUrl))); // Start listening on the extension. ExtensionTestMessageListener listener(/*will_reply=*/false); @@ -172,7 +200,7 @@ IN_PROC_BROWSER_TEST_P(TelemetryExtensionBrowserTest, INSTANTIATE_TEST_SUITE_P( All, - TelemetryExtensionBrowserTest, + TelemetryExtensionCapabilitiesWithCmdBrowserTest, testing::Combine( testing::Bool(), testing::ValuesIn( diff --git a/chrome/browser/chromeos/policy/dlp/dlp_content_observer.cc b/chrome/browser/chromeos/policy/dlp/dlp_content_observer.cc index a17af62b5e9e15..70e4bb6c33a0db 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_content_observer.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_content_observer.cc @@ -7,7 +7,7 @@ #include "build/chromeos_buildflags.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #endif #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -25,9 +25,9 @@ DlpContentObserver* DlpContentObserver::Get() { if (g_testing_dlp_content_observer) return g_testing_dlp_content_observer; - // Initializes DlpContentManager(Lacros) if needed. + // Initializes DlpContentManager(Ash/Lacros) if needed. #if BUILDFLAG(IS_CHROMEOS_ASH) - return DlpContentManager::Get(); + return DlpContentManagerAsh::Get(); #else return DlpContentManagerLacros::Get(); #endif diff --git a/chrome/browser/commerce/merchant_viewer/android/BUILD.gn b/chrome/browser/commerce/merchant_viewer/android/BUILD.gn index 9055039cd8a1f6..84ad48e8465ed0 100644 --- a/chrome/browser/commerce/merchant_viewer/android/BUILD.gn +++ b/chrome/browser/commerce/merchant_viewer/android/BUILD.gn @@ -45,7 +45,6 @@ android_library("java") { "//chrome/browser/tab:java", "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/favicon:java", - "//chrome/browser/version:java", "//components/browser_ui/bottomsheet/android:java", "//components/browser_ui/widget/android:java", "//components/embedder_support/android:content_view_java", @@ -65,6 +64,7 @@ android_library("java") { "//components/thin_webview:thin_webview", "//components/url_formatter/android:url_formatter_java", "//components/user_prefs/android:java", + "//components/version_info/android:version_constants_java", "//content/public/android:content_java", "//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_appcompat_appcompat_resources_java", diff --git a/chrome/browser/commerce/merchant_viewer/android/java/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustBottomSheetMediator.java b/chrome/browser/commerce/merchant_viewer/android/java/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustBottomSheetMediator.java index 30b6b6e4fc6934..9fb1cf4617054f 100644 --- a/chrome/browser/commerce/merchant_viewer/android/java/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustBottomSheetMediator.java +++ b/chrome/browser/commerce/merchant_viewer/android/java/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustBottomSheetMediator.java @@ -17,7 +17,6 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ui.favicon.FaviconHelper; import org.chromium.chrome.browser.ui.favicon.FaviconUtils; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.chrome.tab_ui.R; import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid; import org.chromium.components.embedder_support.util.UrlUtilitiesJni; @@ -25,6 +24,7 @@ import org.chromium.components.security_state.ConnectionSecurityLevel; import org.chromium.components.security_state.SecurityStateModel; import org.chromium.components.thinwebview.ThinWebView; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationHandle; import org.chromium.content_public.browser.RenderCoordinates; @@ -192,7 +192,7 @@ private void createWebContents() { mWebContentView = ContentView.createContentView(mContext, null, mWebContents); final ViewAndroidDelegate delegate = ViewAndroidDelegate.createBasicDelegate(mWebContentView); - mWebContents.initialize(ChromeVersionInfo.getProductVersion(), delegate, mWebContentView, + mWebContents.initialize(VersionInfo.getProductVersion(), delegate, mWebContentView, mWindowAndroid, WebContents.createDefaultInternalsHolder()); WebContentsHelpers.setUserAgentOverride(mWebContents); } diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index eb2b0f714c2602..7b56123c921530 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -129,8 +129,8 @@ const char kManifestKeyIsRequiredError[] = "The 'manifestKey' argument is required for manifest files."; const char kCouldNotFindWebContentsError[] = "Could not find a valid web contents."; -const char kCannotUpdateSupervisedProfileSettingsError[] = - "Cannot change settings for a supervised profile."; +const char kCannotUpdateChildAccountProfileSettingsError[] = + "Cannot change settings for a child account profile."; const char kNoOptionsPageForExtensionError[] = "Extension does not have an options page."; const char kCannotRepairHealthyExtension[] = @@ -308,7 +308,7 @@ DeveloperPrivateAPI::GetFactoryInstance() { std::unique_ptr DeveloperPrivateAPI::CreateProfileInfo( Profile* profile) { std::unique_ptr info(new developer::ProfileInfo()); - info->is_supervised = profile->IsChild(); + info->is_child_account = profile->IsChild(); PrefService* prefs = profile->GetPrefs(); const PrefService::Preference* pref = prefs->FindPreference(prefs::kExtensionsUIDeveloperMode); @@ -316,7 +316,7 @@ std::unique_ptr DeveloperPrivateAPI::CreateProfileInfo( IncognitoModePrefs::Availability::kDisabled; info->is_developer_mode_controlled_by_policy = pref->IsManaged(); info->in_developer_mode = - !info->is_supervised && + !info->is_child_account && prefs->GetBoolean(prefs::kExtensionsUIDeveloperMode); info->can_load_unpacked = ExtensionManagementFactory::GetForBrowserContext(profile) @@ -896,7 +896,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() { PrefService* prefs = profile->GetPrefs(); if (update.in_developer_mode) { if (profile->IsChild()) - return RespondNow(Error(kCannotUpdateSupervisedProfileSettingsError)); + return RespondNow(Error(kCannotUpdateChildAccountProfileSettingsError)); prefs->SetBoolean(prefs::kExtensionsUIDeveloperMode, *update.in_developer_mode); } @@ -1110,7 +1110,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateLoadUnpackedFunction::Run() { Profile* profile = Profile::FromBrowserContext(browser_context()); if (profile->IsChild()) { return RespondNow( - Error("Supervised users cannot load unpacked extensions.")); + Error("Child account users cannot load unpacked extensions.")); } PrefService* prefs = profile->GetPrefs(); if (!prefs->GetBoolean(prefs::kExtensionsUIDeveloperMode)) { diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc index 777210e2f6c71b..fea8582b4177e9 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc @@ -1897,7 +1897,7 @@ TEST_F(DeveloperPrivateApiSupervisedUserUnitTest, function->SetRenderFrameHost(web_contents->GetMainFrame()); std::string error = extension_function_test_utils::RunFunctionAndReturnError( function.get(), "[]", browser()); - EXPECT_THAT(error, testing::HasSubstr("Supervised")); + EXPECT_THAT(error, testing::HasSubstr("Child account")); } #endif diff --git a/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc b/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc index 07c32b7eae8f15..78f610f3c4705c 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc @@ -39,7 +39,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/test/ash_test_helper.h" #include "ash/test/test_window_builder.h" -#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h" #include "chrome/browser/ui/ash/window_pin_util.h" #endif @@ -1208,8 +1208,8 @@ TEST_F(TabsApiUnitTest, ScreenshotsRestricted) { web_contents_tester->NavigateAndCommit(kGoogle); // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager_( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager_( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, IsScreenshotApiRestricted(testing::_)) .Times(1) diff --git a/chrome/browser/extensions/api/tabs/tabs_util_ash.cc b/chrome/browser/extensions/api/tabs/tabs_util_ash.cc index b33113e4663115..c81be5620c56f6 100644 --- a/chrome/browser/extensions/api/tabs/tabs_util_ash.cc +++ b/chrome/browser/extensions/api/tabs/tabs_util_ash.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/tabs/tabs_util.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h" #include "chrome/browser/ui/ash/window_pin_util.h" #include "chrome/browser/ui/browser.h" @@ -36,7 +36,7 @@ void SetLockedFullscreenState(Browser* browser, bool pinned) { } bool IsScreenshotRestricted(content::WebContents* web_contents) { - return policy::DlpContentManager::Get()->IsScreenshotApiRestricted( + return policy::DlpContentManagerAsh::Get()->IsScreenshotApiRestricted( ScreenshotArea::CreateForWindow(web_contents->GetNativeView())); } diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 4119a4f2701016..d1a2524ac00b42 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json @@ -3236,6 +3236,11 @@ "owners": [ "abeyad", "potassium-katabolism@google.com" ], "expiry_milestone": 100 }, + { + "name": "force-minor-version-to-100", + "owners": [ "abeyad", "potassium-katabolism@google.com" ], + "expiry_milestone": 100 + }, { "name": "force-show-continue-section", "owners":["anasalazar@chromium.org", "gzadina@google.com"], diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index bbfbfe96769cde..29431d34cd48b9 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc @@ -2823,6 +2823,17 @@ const char kForceMajorVersion100InUserAgentDescription[] = "allows testing the 3-digit major version number before the actual M100 " "release. This flag is only available from M96-M99."; +const char kForceMinorVersion100InUserAgentName[] = + "Force the minor version to 100 in the User-Agent string"; +const char kForceMinorVersion100InUserAgentDescription[] = + "Force the Chrome minor version in the User-Agent string to 100, which " + "allows testing a 3-digit minor version number. Currently, the minor " + "version is always reported as 0, but due to potential breakage with the " + "upcoming major version 100, this flag allows us to test whether setting " + "the major version in the minor version part of the User-Agent string " + "would be an acceptable alternative. If force-major-version-to-100 is set, " + "then this flag has no effect. See crbug.com/1278459 for details."; + // Android --------------------------------------------------------------------- #if defined(OS_ANDROID) diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index d63bafc4661166..8fee41823a7965 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -1629,6 +1629,9 @@ extern const char kShareContextMenuDescription[]; extern const char kForceMajorVersion100InUserAgentName[]; extern const char kForceMajorVersion100InUserAgentDescription[]; +extern const char kForceMinorVersion100InUserAgentName[]; +extern const char kForceMinorVersion100InUserAgentDescription[]; + // Android -------------------------------------------------------------------- #if defined(OS_ANDROID) diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn index 056fe7f0635817..6f136cfa780290 100644 --- a/chrome/browser/flags/BUILD.gn +++ b/chrome/browser/flags/BUILD.gn @@ -24,7 +24,7 @@ android_library("java") { "//base:base_java", "//build:chromeos_buildflags", "//chrome/browser/preferences:java", - "//chrome/browser/version:java", + "//components/version_info/android:version_constants_java", "//third_party/android_deps:guava_android_java", "//third_party/androidx:androidx_annotation_annotation_java", ] diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlagsSafeMode.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlagsSafeMode.java index 723ab98ab31e7a..ce4452cc1156c9 100644 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlagsSafeMode.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFlagsSafeMode.java @@ -18,7 +18,7 @@ import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.version.ChromeVersionInfo; +import org.chromium.components.version_info.VersionInfo; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -78,7 +78,7 @@ void onFlagChecked() { int behavior; if (cachedVersion.isEmpty()) { behavior = Behavior.ENGAGED_WITHOUT_SAFE_VALUES; - } else if (!cachedVersion.equals(ChromeVersionInfo.getProductVersion())) { + } else if (!cachedVersion.equals(VersionInfo.getProductVersion())) { behavior = Behavior.ENGAGED_IGNORING_OUTDATED_SAFE_VALUES; } else { behavior = Behavior.ENGAGED_WITH_SAFE_VALUES; @@ -189,7 +189,7 @@ private void writeSafeValues(ValuesReturned safeValuesReturned) { editor.putString(pair.getKey(), pair.getValue()); } } - editor.putString(PREF_SAFE_VALUES_VERSION, ChromeVersionInfo.getProductVersion()); + editor.putString(PREF_SAFE_VALUES_VERSION, VersionInfo.getProductVersion()); editor.apply(); TraceEvent.end("writeSafeValues"); } diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc index c5123e61a3bff2..f41ac9b8159d15 100644 --- a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc +++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc @@ -56,7 +56,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/shell.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "ui/base/ui_base_features.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -234,7 +234,8 @@ void DesktopCaptureAccessHandler::ProcessScreenCaptureAccessRequest( primary_root_window_for_testing_ ? primary_root_window_for_testing_ : ash::Shell::Get()->GetPrimaryRootWindow()); - if (policy::DlpContentManager::Get()->IsScreenCaptureRestricted(screen_id)) { + if (policy::DlpContentManagerAsh::Get()->IsScreenCaptureRestricted( + screen_id)) { std::move(callback).Run( blink::MediaStreamDevices(), blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED, nullptr); @@ -424,7 +425,8 @@ void DesktopCaptureAccessHandler::HandleRequest( } #if BUILDFLAG(IS_CHROMEOS_ASH) { - if (policy::DlpContentManager::Get()->IsScreenCaptureRestricted(media_id)) { + if (policy::DlpContentManagerAsh::Get()->IsScreenCaptureRestricted( + media_id)) { std::move(callback).Run( blink::MediaStreamDevices(), blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED, nullptr); @@ -613,7 +615,8 @@ void DesktopCaptureAccessHandler::OnPickerDialogResults( } #if BUILDFLAG(IS_CHROMEOS_ASH) - if (policy::DlpContentManager::Get()->IsScreenCaptureRestricted(media_id)) { + if (policy::DlpContentManagerAsh::Get()->IsScreenCaptureRestricted( + media_id)) { std::move(pending_request.callback) .Run(blink::MediaStreamDevices(), blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED, diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc index e44ebcc46f548c..9317fb466d33fb 100644 --- a/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc @@ -32,7 +32,7 @@ #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h" #include "ui/aura/window.h" #endif @@ -384,8 +384,8 @@ TEST_F(DesktopCaptureAccessHandlerTest, ScreenCaptureAccessSuccess) { #if BUILDFLAG(IS_CHROMEOS_ASH) TEST_F(DesktopCaptureAccessHandlerTest, ScreenCaptureAccessDlpRestricted) { // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, IsScreenCaptureRestricted(testing::_)) .Times(1) @@ -416,8 +416,8 @@ TEST_F(DesktopCaptureAccessHandlerTest, ScreenCaptureAccessDlpRestricted) { TEST_F(DesktopCaptureAccessHandlerTest, GenerateStreamDlpRestricted) { // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, IsScreenCaptureRestricted(testing::_)) .Times(1) @@ -445,8 +445,8 @@ TEST_F(DesktopCaptureAccessHandlerTest, GenerateStreamDlpRestricted) { TEST_F(DesktopCaptureAccessHandlerTest, ChangeSourceDlpRestricted) { // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, IsScreenCaptureRestricted(testing::_)) .Times(1) diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc index eaae9d4acfa0c3..6625771d00a216 100644 --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc @@ -37,7 +37,7 @@ #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if defined(OS_MAC) @@ -440,7 +440,7 @@ void DisplayMediaAccessHandler::OnDisplaySurfaceSelected( #if BUILDFLAG(IS_CHROMEOS_ASH) // Check Data Leak Prevention restrictions on Chrome. - policy::DlpContentManager::Get()->CheckScreenShareRestriction( + policy::DlpContentManagerAsh::Get()->CheckScreenShareRestriction( media_id, GetApplicationTitle(web_contents), base::BindOnce(&DisplayMediaAccessHandler::OnDlpRestrictionChecked, base::Unretained(this), web_contents, media_id)); diff --git a/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc b/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc index 2593c9e7731e0f..6c7962af9983af 100644 --- a/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc @@ -31,7 +31,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h" #endif class DisplayMediaAccessHandlerTest : public ChromeRenderViewHostTestHarness { @@ -258,8 +258,8 @@ TEST_F(DisplayMediaAccessHandlerTest, DlpRestricted) { content::DesktopMediaID::kFakeId); // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, CheckScreenShareRestriction) .WillOnce([](const content::DesktopMediaID& media_id, @@ -513,8 +513,8 @@ TEST_F(DisplayMediaAccessHandlerTest, ChangeSourceDlpRestricted) { content::DesktopMediaID::kNullId, GetWebContentsMediaCaptureId()); // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager_( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager_( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, CheckScreenShareRestriction) .WillOnce([](const content::DesktopMediaID& media_id, diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc index aa44e5bdc7890f..9eea99c487e114 100644 --- a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc +++ b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc @@ -47,7 +47,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #endif using content::BrowserThread; @@ -240,7 +240,7 @@ class MediaStreamCaptureIndicator::UIDelegate : public content::MediaStreamUI { } #if BUILDFLAG(IS_CHROMEOS_ASH) - policy::DlpContentManager::Get()->OnScreenCaptureStarted( + policy::DlpContentManagerAsh::Get()->OnScreenCaptureStarted( label, screen_capture_ids, application_title_, state_change_callback); #endif @@ -256,7 +256,8 @@ class MediaStreamCaptureIndicator::UIDelegate : public content::MediaStreamUI { void OnDeviceStopped(const std::string& label, const content::DesktopMediaID& media_id) override { #if BUILDFLAG(IS_CHROMEOS_ASH) - policy::DlpContentManager::Get()->OnScreenCaptureStopped(label, media_id); + policy::DlpContentManagerAsh::Get()->OnScreenCaptureStopped(label, + media_id); #endif } diff --git a/chrome/browser/media/webrtc/tab_capture_access_handler.cc b/chrome/browser/media/webrtc/tab_capture_access_handler.cc index 03de8535c43353..771c6125598b39 100644 --- a/chrome/browser/media/webrtc/tab_capture_access_handler.cc +++ b/chrome/browser/media/webrtc/tab_capture_access_handler.cc @@ -21,6 +21,10 @@ #include "extensions/common/permissions/permissions_data.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h" +#if BUILDFLAG(IS_CHROMEOS_ASH) +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" +#endif // BUILDFLAG(IS_CHROMEOS_ASH) + namespace { // This helper class is designed to live as long as the capture, and is used // when no other MediaStreamUI object is used. If the capture violates the @@ -58,10 +62,6 @@ class SameOriginPolicyUI : public MediaStreamUI { }; } // namespace -#if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" -#endif // BUILDFLAG(IS_CHROMEOS_ASH) - TabCaptureAccessHandler::TabCaptureAccessHandler() = default; TabCaptureAccessHandler::~TabCaptureAccessHandler() = default; @@ -127,7 +127,8 @@ void TabCaptureAccessHandler::HandleRequest( content::DesktopMediaID::TYPE_WEB_CONTENTS, /*id=*/0, content::WebContentsMediaCaptureId(request.render_process_id, request.render_frame_id)); - if (policy::DlpContentManager::Get()->IsScreenCaptureRestricted(media_id)) { + if (policy::DlpContentManagerAsh::Get()->IsScreenCaptureRestricted( + media_id)) { std::move(callback).Run( devices, blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED, std::move(ui)); diff --git a/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc b/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc index 9434a04b6d1ffe..ebf9b884756a8b 100644 --- a/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc @@ -24,7 +24,7 @@ #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/mock_dlp_content_manager_ash.h" #endif class TabCaptureAccessHandlerTest : public ChromeRenderViewHostTestHarness { @@ -110,8 +110,8 @@ TEST_F(TabCaptureAccessHandlerTest, DlpRestricted) { web_contents()->GetMainFrame()->GetRoutingID())); // Setup Data Leak Prevention restriction. - policy::MockDlpContentManager mock_dlp_content_manager; - policy::ScopedDlpContentManagerForTesting scoped_dlp_content_manager_( + policy::MockDlpContentManagerAsh mock_dlp_content_manager; + policy::ScopedDlpContentManagerAshForTesting scoped_dlp_content_manager_( &mock_dlp_content_manager); EXPECT_CALL(mock_dlp_content_manager, IsScreenCaptureRestricted(source)) .Times(1) diff --git a/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc b/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc index f22af2d78f9012..d24c88c488c0e6 100644 --- a/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc +++ b/chrome/browser/media/webrtc/webrtc_getdisplaymedia_browsertest.cc @@ -39,7 +39,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager_test_helper.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash_test_helper.h" #include "chrome/browser/chromeos/policy/dlp/dlp_content_restriction_set.h" #endif @@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcScreenCaptureBrowserTestWithPicker, ScreenCaptureVideoWithDlp) { ASSERT_TRUE(embedded_test_server()->Start()); - policy::DlpContentManagerTestHelper helper; + policy::DlpContentManagerAshTestHelper helper; content::WebContents* tab = OpenTestPageInNewTab(kMainHtmlPage); RunGetDisplayMedia(tab, GetConstraints(/*video=*/true, /*audio=*/false), /*is_fake_ui=*/false, test_config_.accept_this_tab_capture, diff --git a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.cc b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.cc index 3721625b25e83d..01518c23a8a222 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.cc +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.cc @@ -10,6 +10,7 @@ #include "base/time/time.h" #include "chrome/browser/nearby_sharing/fast_initiation/constants.h" #include "chrome/browser/nearby_sharing/logging/logging.h" +#include "chrome/browser/nearby_sharing/nearby_share_metrics_logger.h" #include "device/bluetooth/bluetooth_low_energy_scan_filter.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -113,6 +114,7 @@ void FastInitiationScanner::OnSessionStarted( } else { NS_LOG(VERBOSE) << __func__ << ": Success"; } + RecordNearbyShareBackgroundScanningSessionStarted(/*success=*/!error_code); } void FastInitiationScanner::OnDeviceFound( @@ -123,8 +125,11 @@ void FastInitiationScanner::OnDeviceFound( detected_devices_.insert(device->GetAddress()); // Invoke the callback when we go from zero devices to more than zero. - if (device_count_prev == 0) + if (device_count_prev == 0) { devices_detected_callback_.Run(); + RecordNearbyShareBackgroundScanningDevicesDetected(); + devices_detected_timestamp_ = base::TimeTicks::Now(); + } } void FastInitiationScanner::OnDeviceLost( @@ -138,8 +143,11 @@ void FastInitiationScanner::OnDeviceLost( } // Invoke the callback when we go from more than zero devices to zero. - if (device_count_prev > 0 && detected_devices_.empty()) + if (device_count_prev > 0 && detected_devices_.empty()) { devices_not_detected_callback_.Run(); + RecordNearbyShareBackgroundScanningDevicesDetectedDuration( + base::TimeTicks::Now() - devices_detected_timestamp_); + } } void FastInitiationScanner::OnSessionInvalidated( diff --git a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h index 048eea91156d0d..a745bf0429b8cf 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h @@ -80,6 +80,8 @@ class FastInitiationScanner // Set of remote devices that we detect are currently emitting fast initiation // advertisements. base::flat_set detected_devices_; + // The last time that devices detected went from zero to greater than zero. + base::TimeTicks devices_detected_timestamp_; base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/chrome/browser/nearby_sharing/nearby_notification_manager.cc b/chrome/browser/nearby_sharing/nearby_notification_manager.cc index 3d54a8c6c41619..e8d918448ab54e 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_manager.cc +++ b/chrome/browser/nearby_sharing/nearby_notification_manager.cc @@ -24,6 +24,7 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/nearby_sharing/logging/logging.h" +#include "chrome/browser/nearby_sharing/nearby_share_metrics_logger.h" #include "chrome/browser/nearby_sharing/nearby_sharing_service.h" #include "chrome/browser/notifications/notification_display_service.h" #include "chrome/browser/platform_util.h" @@ -560,7 +561,8 @@ class NearbyDeviceTryingToShareNotificationDelegate manager_->OnNearbyDeviceTryingToShareClicked(); break; case 1: - manager_->OnNearbyDeviceTryingToShareDismissed(); + manager_->OnNearbyDeviceTryingToShareDismissed( + /*did_click_dismiss=*/true); break; default: NOTREACHED(); @@ -569,7 +571,7 @@ class NearbyDeviceTryingToShareNotificationDelegate } void OnClose(const std::string& notification_id) override { - manager_->OnNearbyDeviceTryingToShareDismissed(); + manager_->OnNearbyDeviceTryingToShareDismissed(/*did_click_dismiss=*/false); } private: @@ -860,6 +862,19 @@ void NearbyNotificationManager::ShowNearbyDeviceTryingToShare() { notification_display_service_->Display( NotificationHandler::Type::NEARBY_SHARE, notification, /*metadata=*/nullptr); + + last_device_nearby_sharing_notification_shown_timestamp_ = + base::TimeTicks::Now(); + + if (is_onboarding_complete) { + RecordNearbyShareDeviceNearbySharingNotificationFlowEvent( + NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent:: + kNotificationShown); + } else { + RecordNearbyShareSetupNotificationFlowEvent( + NearbyShareBackgroundScanningSetupNotificationFlowEvent:: + kNotificationShown); + } } void NearbyNotificationManager::ShowSuccess(const ShareTarget& share_target) { @@ -1049,11 +1064,49 @@ void NearbyNotificationManager::OnNearbyDeviceTryingToShareClicked() { // page with a stale timestamp. path += "&time=" + GetTimestampString(); settings_opener_->ShowSettingsPage(profile_, path); + + bool is_onboarding_complete = pref_service_->GetBoolean( + prefs::kNearbySharingOnboardingCompletePrefName); + if (is_onboarding_complete) { + RecordNearbyShareDeviceNearbySharingNotificationFlowEvent( + NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent:: + kEnable); + RecordNearbyShareDeviceNearbySharingNotificationTimeToAction( + base::TimeTicks::Now() - + last_device_nearby_sharing_notification_shown_timestamp_); + } else { + RecordNearbyShareSetupNotificationFlowEvent( + NearbyShareBackgroundScanningSetupNotificationFlowEvent::kSetup); + RecordNearbyShareSetupNotificationTimeToAction( + base::TimeTicks::Now() - + last_device_nearby_sharing_notification_shown_timestamp_); + } } -void NearbyNotificationManager::OnNearbyDeviceTryingToShareDismissed() { +void NearbyNotificationManager::OnNearbyDeviceTryingToShareDismissed( + bool did_click_dismiss) { CloseNearbyDeviceTryingToShare(); UpdateNearbyDeviceTryingToShareDismissedTime(pref_service_); + + bool is_onboarding_complete = pref_service_->GetBoolean( + prefs::kNearbySharingOnboardingCompletePrefName); + + if (is_onboarding_complete) { + RecordNearbyShareDeviceNearbySharingNotificationFlowEvent( + did_click_dismiss + ? NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent:: + kDismiss + : NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent:: + kExit); + } else { + RecordNearbyShareSetupNotificationFlowEvent( + did_click_dismiss + ? NearbyShareBackgroundScanningSetupNotificationFlowEvent::kDismiss + : NearbyShareBackgroundScanningSetupNotificationFlowEvent::kExit); + RecordNearbyShareSetupNotificationTimeToAction( + base::TimeTicks::Now() - + last_device_nearby_sharing_notification_shown_timestamp_); + } } void NearbyNotificationManager::CloseSuccessNotification() { diff --git a/chrome/browser/nearby_sharing/nearby_notification_manager.h b/chrome/browser/nearby_sharing/nearby_notification_manager.h index 0eb6b34ee12303..c0f80e49d8208d 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_manager.h +++ b/chrome/browser/nearby_sharing/nearby_notification_manager.h @@ -141,7 +141,7 @@ class NearbyNotificationManager : public TransferUpdateCallback, // Called when the nearby device is trying notification got dismissed. We // won't show another one for a certain time period after this. - void OnNearbyDeviceTryingToShareDismissed(); + void OnNearbyDeviceTryingToShareDismissed(bool did_click_dismiss); void CloseSuccessNotification(); @@ -172,6 +172,10 @@ class NearbyNotificationManager : public TransferUpdateCallback, // is in progress. absl::optional last_transfer_status_; + // The last time that 'Nearby device is trying to share' notification was + // shown. + base::TimeTicks last_device_nearby_sharing_notification_shown_timestamp_; + base::OnceCallback success_action_test_callback_; diff --git a/chrome/browser/nearby_sharing/nearby_share_metrics_logger.cc b/chrome/browser/nearby_sharing/nearby_share_metrics_logger.cc index 528ff7cb314700..6aa0cd6c2a64ee 100644 --- a/chrome/browser/nearby_sharing/nearby_share_metrics_logger.cc +++ b/chrome/browser/nearby_sharing/nearby_share_metrics_logger.cc @@ -17,6 +17,16 @@ namespace { const size_t kBytesPerKilobyte = 1024; const uint64_t k5MbInBytes = 5242880; +// These values are persisted to logs. Entries should not be renumbered and +// numeric values should never be reused. The numbers here correspond to the +// ordering of the flow. This enum should be kept in sync with the +// NearbyShareBackgroundScanningSetupNotificationFlowEvent enum in +// src/tools/metrics/histograms/enums.xml. +enum class BackgroundScanningDevicesDetectedEvent { + kNearbyDevicesDetected = 1, + kMaxValue = kNearbyDevicesDetected +}; + // These values are persisted to logs. Entries should not be renumbered and // numeric values should never be reused. If entries are added, kMaxValue should // be updated. @@ -589,3 +599,48 @@ void RecordNearbyShareTransferFinalStatusMetric( } } } + +void RecordNearbyShareDeviceNearbySharingNotificationFlowEvent( + NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent + event) { + base::UmaHistogramSparse( + "Nearby.Share.BackgroundScanning.DeviceNearbySharing.Notification.Flow", + static_cast(event)); +} + +void RecordNearbyShareDeviceNearbySharingNotificationTimeToAction( + base::TimeDelta time) { + base::UmaHistogramMediumTimes( + "Nearby.Share.BackgroundScanning.DeviceNearbySharing.Notification." + "TimeToAction", + time); +} + +void RecordNearbyShareBackgroundScanningDevicesDetected() { + base::UmaHistogramEnumeration( + "Nearby.Share.BackgroundScanning.DevicesDetected", + BackgroundScanningDevicesDetectedEvent::kNearbyDevicesDetected); +} + +void RecordNearbyShareBackgroundScanningDevicesDetectedDuration( + base::TimeDelta duration) { + base::UmaHistogramLongTimes( + "Nearby.Share.BackgroundScanning.DevicesDetected.Duration", duration); +} + +void RecordNearbyShareBackgroundScanningSessionStarted(bool success) { + base::UmaHistogramBoolean("Nearby.Share.BackgroundScanning.SessionStarted", + success); +} + +void RecordNearbyShareSetupNotificationFlowEvent( + NearbyShareBackgroundScanningSetupNotificationFlowEvent event) { + base::UmaHistogramSparse( + "Nearby.Share.BackgroundScanning.Setup.Notification.Flow", + static_cast(event)); +} + +void RecordNearbyShareSetupNotificationTimeToAction(base::TimeDelta time) { + base::UmaHistogramMediumTimes( + "Nearby.Share.BackgroundScanning.Setup.Notification.TimeToAction", time); +} diff --git a/chrome/browser/nearby_sharing/nearby_share_metrics_logger.h b/chrome/browser/nearby_sharing/nearby_share_metrics_logger.h index 211e69d308a1c7..a22fd2fb9c06b1 100644 --- a/chrome/browser/nearby_sharing/nearby_share_metrics_logger.h +++ b/chrome/browser/nearby_sharing/nearby_share_metrics_logger.h @@ -14,6 +14,31 @@ #include "chrome/browser/nearby_sharing/transfer_metadata.h" #include "third_party/abseil-cpp/absl/types/optional.h" +// These values are persisted to logs. Entries should not be renumbered and +// numeric values should never be reused. The numbers here correspond to the +// ordering of the flow. This enum should be kept in sync with the +// NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent enum in +// src/tools/metrics/histograms/enums.xml. +enum class + NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent { + kNotificationShown = 1, + kEnable = 12, + kDismiss = 13, + kExit = 14, + }; + +// These values are persisted to logs. Entries should not be renumbered and +// numeric values should never be reused. The numbers here correspond to the +// ordering of the flow. This enum should be kept in sync with the +// NearbyShareBackgroundScanningSetupNotificationFlowEvent enum in +// src/tools/metrics/histograms/enums.xml. +enum class NearbyShareBackgroundScanningSetupNotificationFlowEvent { + kNotificationShown = 1, + kSetup = 12, + kDismiss = 13, + kExit = 14, +}; + void RecordNearbyShareEnabledMetric(NearbyShareEnabledState state); void RecordNearbyShareEstablishConnectionMetrics( @@ -77,4 +102,23 @@ void RecordNearbyShareTransferFinalStatusMetric( TransferMetadata::Status status, bool is_known); +void RecordNearbyShareDeviceNearbySharingNotificationFlowEvent( + NearbyShareBackgroundScanningDeviceNearbySharingNotificationFlowEvent + event); + +void RecordNearbyShareDeviceNearbySharingNotificationTimeToAction( + base::TimeDelta time); + +void RecordNearbyShareBackgroundScanningDevicesDetected(); + +void RecordNearbyShareBackgroundScanningDevicesDetectedDuration( + base::TimeDelta duration); + +void RecordNearbyShareBackgroundScanningSessionStarted(bool success); + +void RecordNearbyShareSetupNotificationFlowEvent( + NearbyShareBackgroundScanningSetupNotificationFlowEvent event); + +void RecordNearbyShareSetupNotificationTimeToAction(base::TimeDelta time); + #endif // CHROME_BROWSER_NEARBY_SHARING_NEARBY_SHARE_METRICS_LOGGER_H_ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java index a8317123a12568..0fad594c3b401c 100644 --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java @@ -97,7 +97,7 @@ public static boolean hasChosenToSyncPasswords(SyncService syncService) { */ public static boolean hasChosenToSyncPasswordsWithNoCustomPassphrase(SyncService syncService) { return PasswordManagerHelper.hasChosenToSyncPasswords(syncService) - && !syncService.isUsingExplicitPassphrase(); + && syncService.isEngineInitialized() && !syncService.isUsingExplicitPassphrase(); } /** @@ -109,6 +109,7 @@ public static boolean hasChosenToSyncPasswordsWithNoCustomPassphrase(SyncService public static boolean isSyncingPasswordsWithNoCustomPassphrase(SyncService syncService) { if (syncService == null || !syncService.hasSyncConsent()) return false; if (!syncService.getActiveDataTypes().contains(ModelType.PASSWORDS)) return false; + if (!syncService.isEngineInitialized()) return false; if (syncService.isUsingExplicitPassphrase()) return false; return true; } diff --git a/chrome/browser/password_manager/android/junit/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelperTest.java b/chrome/browser/password_manager/android/junit/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelperTest.java index 35b05a1f9e3a09..67940dc25e68dd 100644 --- a/chrome/browser/password_manager/android/junit/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelperTest.java +++ b/chrome/browser/password_manager/android/junit/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelperTest.java @@ -131,17 +131,31 @@ public void testSyncEnabledWithCustomPassphrase() { when(mSyncServiceMock.isSyncFeatureEnabled()).thenReturn(true); when(mSyncServiceMock.getChosenDataTypes()) .thenReturn(CollectionUtil.newHashSet(ModelType.PASSWORDS)); + when(mSyncServiceMock.isEngineInitialized()).thenReturn(true); when(mSyncServiceMock.isUsingExplicitPassphrase()).thenReturn(true); Assert.assertTrue(PasswordManagerHelper.hasChosenToSyncPasswords(mSyncServiceMock)); Assert.assertFalse(PasswordManagerHelper.hasChosenToSyncPasswordsWithNoCustomPassphrase( mSyncServiceMock)); } + @Test + public void testSyncEnabledButInitializing() { + when(mSyncServiceMock.isSyncFeatureEnabled()).thenReturn(true); + when(mSyncServiceMock.getChosenDataTypes()) + .thenReturn(CollectionUtil.newHashSet(ModelType.PASSWORDS)); + when(mSyncServiceMock.isEngineInitialized()).thenReturn(false); + Assert.assertTrue(PasswordManagerHelper.hasChosenToSyncPasswords(mSyncServiceMock)); + Assert.assertFalse(PasswordManagerHelper.hasChosenToSyncPasswordsWithNoCustomPassphrase( + mSyncServiceMock)); + verify(mSyncServiceMock, never()).isUsingExplicitPassphrase(); + } + @Test public void testActivelySyncingPasswordsWithNoCustomPassphrase() { when(mSyncServiceMock.hasSyncConsent()).thenReturn(true); when(mSyncServiceMock.getActiveDataTypes()) .thenReturn(CollectionUtil.newHashSet(ModelType.PASSWORDS)); + when(mSyncServiceMock.isEngineInitialized()).thenReturn(true); when(mSyncServiceMock.isUsingExplicitPassphrase()).thenReturn(false); Assert.assertTrue( PasswordManagerHelper.isSyncingPasswordsWithNoCustomPassphrase(mSyncServiceMock)); @@ -152,6 +166,7 @@ public void testActivelySyncingPasswordsWithCustomPassphrase() { when(mSyncServiceMock.hasSyncConsent()).thenReturn(true); when(mSyncServiceMock.getActiveDataTypes()) .thenReturn(CollectionUtil.newHashSet(ModelType.PASSWORDS)); + when(mSyncServiceMock.isEngineInitialized()).thenReturn(true); when(mSyncServiceMock.isUsingExplicitPassphrase()).thenReturn(true); Assert.assertFalse( PasswordManagerHelper.isSyncingPasswordsWithNoCustomPassphrase(mSyncServiceMock)); diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 2dff3ebf4a9a19..bc429817329609 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -26,7 +26,7 @@ #include "printing/buildflags/buildflags.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #endif using content::BrowserThread; @@ -194,7 +194,7 @@ void PrintViewManager::RejectPrintPreviewRequestIfRestricted( base::OnceCallback callback) { #if BUILDFLAG(IS_CHROMEOS_ASH) // Don't print DLP restricted content on Chrome OS. - policy::DlpContentManager::Get()->CheckPrintingRestriction( + policy::DlpContentManagerAsh::Get()->CheckPrintingRestriction( web_contents(), std::move(callback)); #else std::move(callback).Run(true); diff --git a/chrome/browser/resources/chromeos/login/md_login_polymer3.html b/chrome/browser/resources/chromeos/login/md_login_polymer3.html index 2842449540726e..7cdc1f3eaea1ff 100644 --- a/chrome/browser/resources/chromeos/login/md_login_polymer3.html +++ b/chrome/browser/resources/chromeos/login/md_login_polymer3.html @@ -11,7 +11,6 @@ - diff --git a/chrome/browser/resources/chromeos/login/oobe_polymer3.html b/chrome/browser/resources/chromeos/login/oobe_polymer3.html index 0da0a75b31bd08..b55519669228b2 100644 --- a/chrome/browser/resources/chromeos/login/oobe_polymer3.html +++ b/chrome/browser/resources/chromeos/login/oobe_polymer3.html @@ -11,7 +11,6 @@ - diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/resources/extensions/manager.html index 05321de1697d77..123e3056e3cc9a 100644 --- a/chrome/browser/resources/extensions/manager.html +++ b/chrome/browser/resources/extensions/manager.html @@ -24,7 +24,7 @@ { - this.isSupervised_ = profileInfo.isSupervised; + this.isChildAccount_ = profileInfo.isChildAccount; this.incognitoAvailable_ = profileInfo.isIncognitoAvailable; this.devModeControlledByPolicy = profileInfo.isDeveloperModeControlledByPolicy; diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/resources/extensions/toolbar.html index 5bdfb0ef605044..62ff38f976cfdc 100644 --- a/chrome/browser/resources/extensions/toolbar.html +++ b/chrome/browser/resources/extensions/toolbar.html @@ -89,14 +89,14 @@

$i18n{toolbarDevMode}
diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts index 132398aaa9120a..e45bb841a432ee 100644 --- a/chrome/browser/resources/extensions/toolbar.ts +++ b/chrome/browser/resources/extensions/toolbar.ts @@ -61,7 +61,7 @@ class ExtensionsToolbarElement extends ExtensionsToolbarElementBase { }, devModeControlledByPolicy: Boolean, - isSupervised: Boolean, + isChildAccount: Boolean, // kioskEnabled: Boolean, @@ -83,7 +83,7 @@ class ExtensionsToolbarElement extends ExtensionsToolbarElementBase { delegate: ToolbarDelegate; inDevMode: boolean; devModeControlledByPolicy: boolean; - isSupervised: boolean; + isChildAccount: boolean; // kioskEnabled: boolean; @@ -109,17 +109,17 @@ class ExtensionsToolbarElement extends ExtensionsToolbarElementBase { } private shouldDisableDevMode_(): boolean { - return this.devModeControlledByPolicy || this.isSupervised; + return this.devModeControlledByPolicy || this.isChildAccount; } private getTooltipText_(): string { return this.i18n( - this.isSupervised ? 'controlledSettingChildRestriction' : - 'controlledSettingPolicy'); + this.isChildAccount ? 'controlledSettingChildRestriction' : + 'controlledSettingPolicy'); } private getIcon_(): string { - return this.isSupervised ? 'cr20:kite' : 'cr20:domain'; + return this.isChildAccount ? 'cr20:kite' : 'cr20:domain'; } private onDevModeToggleChange_(e: CustomEvent) { diff --git a/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts b/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts index f510055569e5ef..be408638d1e93e 100644 --- a/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts +++ b/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts @@ -11,8 +11,8 @@ export interface AppearanceBrowserProxy { getDefaultZoom(): Promise; getThemeInfo(themeId: string): Promise; - /** @return Whether the current profile is supervised. */ - isSupervised(): boolean; + /** @return Whether the current profile is a child account. */ + isChildAccount(): boolean; useDefaultTheme(): void; @@ -36,8 +36,8 @@ export class AppearanceBrowserProxyImpl implements AppearanceBrowserProxy { }); } - isSupervised() { - return loadTimeData.getBoolean('isSupervised'); + isChildAccount() { + return loadTimeData.getBoolean('isChildAccount'); } useDefaultTheme() { diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.ts b/chrome/browser/resources/settings/appearance_page/appearance_page.ts index 79dbbe14bb10c5..60d2a6b5dc103d 100644 --- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts @@ -277,7 +277,7 @@ export class SettingsAppearancePageElement extends /** @return Whether to show the "USE GTK+" button. */ private showUseSystem_(themeId: string, useSystemTheme: boolean): boolean { return (!!themeId || !useSystemTheme) && - !this.appearanceBrowserProxy_.isSupervised(); + !this.appearanceBrowserProxy_.isChildAccount(); } /** diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js index 1d4a4987022a6e..f0b209c5e2d477 100644 --- a/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js +++ b/chrome/browser/resources/settings/chromeos/os_people_page/users_page.js @@ -40,7 +40,7 @@ Polymer({ isChild_: { type: Boolean, value() { - return loadTimeData.getBoolean('isSupervised'); + return loadTimeData.getBoolean('isChildAccount'); }, }, diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html index 777ce417c2badf..62a6235366d5da 100644 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html @@ -181,7 +181,7 @@ '$i18nPolymer{clearBrowsingHistorySummarySignedInNoLink}', '$i18nPolymer{clearBrowsingHistorySummarySynced}')]]" disabled="[[clearingInProgress_]]" - hidden="[[isSupervised_]]" no-set-pref> + hidden="[[isChildAccount_]]" no-set-pref> parseInfoFromFilename(String name) { /** @return Whether a Stable channel build of Chrome is being used. */ private static boolean isStableChannelBuild() { if ("stable".equals(sChannelNameOverrideForTest)) return true; - return ChromeVersionInfo.isStableBuild(); + return VersionInfo.isStableBuild(); } /** diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb index 87e964a00022cd..9e0eddaa0a596e 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ja.xtb @@ -104,6 +104,7 @@ ユーザー名をコピー 標準保護機能: {NUM_SELECTED,plural, =1{選択された 1 件のアイテムを削除します}other{選択された # 件のアイテムを削除します}} +Chrome のホームページで新しいコンテンツにアクセスできます セーフ ブラウジング このページの のオフライン コピーを表示しています 履歴 @@ -220,6 +221,7 @@ 読みやすくなるまでスライダをドラッグしてください。段落をダブルタップするとテキストがこれより大きくなります。 サイトのストレージ ログインできません +Chrome を使いこなすヒント: カメラを開けません。エラーが発生しました。 検索するには、単語を長押しします Chrome が使用するデータ全体(アカウント、ブックマーク、保存済みの設定など) @@ -263,6 +265,7 @@ アクセスした URL が Google に送信されます このページのオフライン コピーを表示しています Cookie とサイトデータ +デバイスにアクティビティを保存せずにブラウジングするには、シークレット モードを使用します 動画プレビュー 画像 危険なウェブサイト、ダウンロード、拡張機能から予防的な方法で迅速に保護します @@ -274,6 +277,7 @@ カード番号 パスワードがコピーされました 削減量 +Chrome を既定のブラウザに設定する方法 接続ではダウンロードに時間がかかる可能性があります 言語の追加 お使いのブラウザは によって管理されています @@ -358,6 +362,7 @@ 価格をトラッキングします Chrome へのログインを促すメッセージが表示されます 次回からこのサイトにすばやくアクセスできます +ブックマークを移動しました 位置情報が OFF になっています。Android の設定で ON にしてください。 {BOOKMARKS_COUNT,plural, =1{ 個のブックマーク}other{ 個のブックマーク}} Chrome の履歴に基づくおすすめの記事を表示します @@ -386,6 +391,7 @@ デバイスに保存 残り 1 分 標準プリロード: +おすすめの記事を見るには、下にスクロールします MM Chrome の使用状況レポートを送信する場合は、アクセスした URL がこのレポートに含められます 画像の説明は Wi-Fi に接続すると再開します @@ -651,6 +657,7 @@ Chrome はリクエストされたリソースにアクセスできません。 ページの印刷オプションを開く パスワード作成のポップアップを表示しています +声を使って検索するには、マイクをタップします 表示 通話 ログインしています... @@ -697,6 +704,7 @@ 詳細な使用状況データ エラーが発生しました。 残り 1 時間 + に移動 興味 / 関心 シークレット タブ カードの確認 @@ -801,6 +809,7 @@ Chrome でファイルをダウンロードするにはストレージへのアクセス権が必要です。 OFF 非推奨 GIF のみ共有 +Chrome で声を使って検索できます おすすめの記事を更新できません シークレット タブ タップすると、このアプリの URL がコピーされます @@ -1012,6 +1021,7 @@ Chrome にログイン、の画面が開きました。 Google と共有される情報 このページをすばやく共有します。このショートカットを編集するには、長押ししてください。 +お使いの複数のデバイスで Google の設定やデータを同期するには、ログインします CVC 、タブ、選択中 価格のトラッキングを停止する @@ -1050,6 +1060,7 @@ を復元しました QR コードまたはバーコードをこの枠に合わせてください。 パスワード +Google アカウントで Chrome にログインします chrome_image_ 画像の説明文を取得しますか? リダイレクトがブロックされました @@ -1404,6 +1415,7 @@ - この言語をダウンロードできませんでした。しばらくしてからもう一度お試しください。 Chrome で MB の容量を節約しました トップへ戻る +新しいシークレット タブを開くには、メニューを表示します 保留中 リーディング リストに追加 {TAB_COUNT,plural, =1{ 個のシークレット タブと 個以上のタブが閉じられます}other{ 個のシークレット タブと 個以上のタブが閉じられます}} diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb index baa79ac70a5392..e3c31c8488f3fb 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ky.xtb @@ -104,6 +104,7 @@ Колдонуучунун атын көчүрүү Стандарттуу коргоо: {NUM_SELECTED,plural, =1{Тандалган 1 нерсени алып салуу}other{Тандалган # нерсени алып салуу}} +Chrome’дун башкы бетиндеги жаңы макалаларды окуңуз Коопсуз серептөө Бул барактын оффлайн көчүрмөсү түзүлгөн Таржымал @@ -220,6 +221,7 @@ Жылмышкычты текстти окуганга ыңгайлуу болгонго чейин сүйрөңүз. Параграфты эки жолу таптаганыңыздан кийин, текст ушундай өлчөмдө көрүнүп калышы керек. Сайт дайындары Аккаунтка кирүү мүмкүн эмес +Chrome'ду колдонуу кеңештери: Камера ачылбай жатат. Бир жерден ката кетти. Издөө үчүн сөздү коё бербей, басып туруңуз Chrome пайдаланган жалпы дайындардын, анын ичинде каттоо эсептери, кыстармалар жана сакталган жөндөөлөрдүн жалпы өлчөмү @@ -263,6 +265,7 @@ Сиз баш баккан URL даректери Google'га жөнөтүлүп турат Бул барактын оффлайндагы көчүрмөсү көрсөтүлүүдө Кукилер жана сайттын дайындары +Таржымалды түзмөккө сактабастан серептөө үчүн Жашыруун режимди колдонуп көрүңүз Видеолорду алдын ала көрүү СҮРӨТ Кооптуу вебсайттардан, жүктөлүп алынган файлдардан жана кеңейтүүлөрдөн тез жана проактивдүү коргоо @@ -274,6 +277,7 @@ Картанын номери Сырсөз көчүрүлдү Үнөмдөлгөнү +Chrome'ду демейки серепчи катары жөндөгөндү үйрөнүп алыңыз жүктөп алууну жайлатышы мүмкүн Тил кошуу Серепчини башкарат @@ -358,6 +362,7 @@ Баасына көз салуу Chrome'го кирүү үчүн билдирмелерди көрсөтөт Эмкиде бул сайтка тез өтүңүз +Кыстарма жылды Жайгашкан жерди аныктоо жөндөөсү өчүрүлгөн; аны Android жөндөөлөрүнө өтүп, күйгүзүңүз. {BOOKMARKS_COUNT,plural, =1{ кыстарма}other{ кыстарма}} Chrome'догу сизди кызыктырган макалалар @@ -386,6 +391,7 @@ Түзмөккө сактоо 1 мүн. калды Стандарттуу алдын ала жүктөө: +Сунушталган макалаларды көрүү үчүн ылдый сыдырыңыз АА Chrome'дун колдонулушу тууралуу кабарларды да бөлүшсөңүз, ал кабарларда сиз баш баккан URL даректери камтылат Сүрөттөмөлөр Wi-Fi тармагына туташканыңызда көрүнөт @@ -651,6 +657,7 @@ Google аккаунтуңуздун башка Google кызматтарынан Суралган булакка Chrome’дун кирүү мүмкүнчүлүгү жок. Баракты басып чыгаруу параметрлерин ачуу Сырсөз түзүү калкып чыкмасы көрсөтүлүүдө +Айтып издөө үчүн микрофонду басыңыз Көрүнүш Чалуу Кирүүдө… @@ -697,6 +704,7 @@ Google аккаунтуңуздун башка Google кызматтарынан Кеңейтилген колдонуу статистикасы Ката кетти. 1 саат калды + Кызыккан нерселер Жашыруун өтмөк Картаны ырастаңыз @@ -801,6 +809,7 @@ Google аккаунтуңуздун башка Google кызматтарынан Файлдарды жүктөп алуу үчүн Chrome сактагычка мүмкүнчүлүк алышы керек. Өчүк Сунушталбайт GIF сүрөтүн гана бөлүшүү +Chrome'до оозеки издей аласыз Сунуштар жаңырган жок Жашыруун кыстырмалар Бул колдонмонун URL'ин көчүрүү үчүн таптап коюңуз @@ -1012,6 +1021,7 @@ Privacy Sandbox'тун сынамык версиялары дагы эле иш Chrome'го кириңиз. Ачылды. Google менен эмнелерди бөлүшөсүз Бул баракты ыкчам бөлүшүү. Бул ыкчам баскычты түзөтүү үчүн коё бербей басып туруңуз. +Google'дагы нерселерди бардык түзмөктөрүңүздө колдонуу үчүн аккаунтуңузга кириңиз CVC өтмөгү тандалды Баасына көз салууну токтотуу @@ -1050,6 +1060,7 @@ Privacy Sandbox'тун сынамык версиялары дагы эле иш калыбына келтирилди QR кодун же штрих кодду бул алкакка жайгаштырыңыз. Сырсөздөр +Chrome'го Google аккаунтуңуз менен кириңиз chrome_image_ Сүрөттүн сүрөттөмөлөрүн аласызбы? Багыттоо бөгөттөлгөн: @@ -1404,6 +1415,7 @@ Privacy Sandbox'тун сынамык версиялары дагы эле иш - Бул тил жүктөлүп алынбай калды. Кийинчерээк кайталаңыз. Chrome сизге Мб үнөмдөп берди Башына кайтуу +Жаңы Жашыруун өтмөктү ачуу үчүн менюну ачыңыз күтүүдө Окуу тизмесине кошуу {TAB_COUNT,plural, =1{ жашыруун жана дагы өтмөк жабылат}other{ жашыруун жана дагы өтмөк жабылат}} diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb index 03efacbe1c833e..1d9420531c72b8 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_th.xtb @@ -104,6 +104,7 @@ คัดลอกชื่อผู้ใช้ การปกป้องแบบมาตรฐาน: {NUM_SELECTED,plural, =1{นำ 1 รายการที่เลือกออก}other{นำ # รายการที่เลือกออก}} +ค้นพบเนื้อหาใหม่ในหน้าแรกของ Chrome Safe Browsing คุณกำลังดูสำเนาออฟไลน์ของหน้านี้จากวันที่ ประวัติการเข้าชม @@ -220,6 +221,7 @@ ลากแถบเลื่อนจนกว่าคุณจะสามารถอ่านได้อย่างสะดวก ข้อความควรมีขนาดเท่านี้เป็นอย่างน้อยหลังจากแตะ 2 ครั้งบนย่อหน้า พื้นที่เก็บข้อมูลเว็บไซต์ ลงชื่อเข้าใช้ไม่ได้ +เคล็ดลับในการใช้ Chrome เปิดกล้องไม่ได้ เกิดข้อผิดพลาด แตะคำค้างไว้เพื่อค้นหา ข้อมูลทั้งหมดที่ Chrome ใช้ รวมถึงบัญชี บุ๊กมาร์ก และการตั้งค่าที่บันทึกไว้ @@ -263,6 +265,7 @@ URL ที่คุณเข้าชมจะส่งไปยัง Google ดูสำเนาแบบออฟไลน์ของหน้านี้ คุกกี้และข้อมูลเว็บไซต์ +ลองใช้โหมดไม่ระบุตัวตนเพื่อท่องเว็บโดยไม่บันทึกกิจกรรมในอุปกรณ์ ตัวอย่างวิดีโอ รูปภาพ การปกป้องเชิงรุกอย่างรวดเร็วขึ้นจากเว็บไซต์ การดาวน์โหลด และส่วนขยายที่เป็นอันตราย @@ -274,6 +277,7 @@ หมายเลขบัตร คัดลอกรหัสผ่านแล้ว ประหยัดได้ +ดูวิธีตั้ง Chrome เป็นเบราว์เซอร์เริ่มต้น การเชื่อมต่อ อาจทำให้ดาวน์โหลดได้ช้า เพิ่มภาษา เป็นผู้จัดการเบราว์เซอร์ @@ -358,6 +362,7 @@ กำลังติดตามราคา แสดงข้อความแจ้งให้ลงชื่อเข้าใช้ Chrome ไปที่เว็บไซต์นี้ได้เร็วขึ้นในครั้งถัดไป +ย้ายบุ๊กมาร์กแล้ว ตอนนี้ตำแหน่งปิดอยู่ เปิดตำแหน่งได้ในการตั้งค่า Android {BOOKMARKS_COUNT,plural, =1{บุ๊กมาร์ก รายการ}other{บุ๊กมาร์ก รายการ}} บทความที่เกี่ยวข้องกับความสนใจของคุณใน Chrome @@ -386,6 +391,7 @@ บันทึกลงในอุปกรณ์ เหลือ 1 นาที การโหลดล่วงหน้าแบบมาตรฐาน: +เลื่อนลงเพื่อดูบทความที่แนะนำ ดด หากคุณแชร์รายงานการใช้งาน Chrome ด้วย รายงานดังกล่าวจะรวม URL ที่คุณเข้าชม คำอธิบายรูปภาพจะกลับมาแสดงเมื่อคุณเชื่อมต่อ Wi-Fi @@ -651,6 +657,7 @@ Chrome ไม่มีสิทธิ์เข้าถึงทรัพยากรที่ขอ เปิดตัวเลือกในการพิมพ์หน้า กำลังแสดงป๊อปอัปการสร้างรหัสผ่าน +แตะไมโครโฟนเพื่อค้นหาด้วยเสียง มุมมอง โทร กำลังลงชื่อเข้าใช้... @@ -697,6 +704,7 @@ ข้อมูลการใช้งานเพิ่มเติม มีข้อผิดพลาดเกิดขึ้น เหลือ 1 ชั่วโมง +ไปยัง ความสนใจ แท็บที่ไม่ระบุตัวตน ยืนยันบัตร @@ -801,6 +809,7 @@ Chrome ต้องมีสิทธิ์เข้าถึงพื้นที่เก็บข้อมูลเพื่อดาวน์โหลดไฟล์ ปิด ไม่แนะนำ แชร์ GIF เท่านั้น +คุณใช้เสียงเพื่อค้นหาใน Chrome ได้ รีเฟรช Discover ไม่ได้ แท็บที่ไม่ระบุตัวตน แตะเพื่อคัดลอก URL สำหรับแอปนี้ @@ -1012,6 +1021,7 @@ ลงชื่อเข้าใช้ Chrome เปิดอยู่ สิ่งที่คุณแชร์กับ Google แชร์หน้านี้อย่างรวดเร็ว หากต้องการแก้ไขทางลัดนี้ ให้แตะค้างไว้ +ลงชื่อเข้าใช้เพื่อรับบริการและผลิตภัณฑ์ต่างๆ ของ Google ในอุปกรณ์ CVC เลือกแท็บ แล้ว หยุดติดตามราคา @@ -1050,6 +1060,7 @@ คืนค่า แล้ว จัดตำแหน่งคิวอาร์โค้ดหรือบาร์โค้ดให้อยู่ในกรอบนี้ รหัสผ่าน +ลงชื่อเข้าใช้ Chrome ด้วยบัญชี Google chrome_image_ รับคำอธิบายรูปภาพใช่ไหม การเปลี่ยนเส้นทางถูกบล็อก @@ -1404,6 +1415,7 @@ - ดาวน์โหลดภาษานี้ไม่ได้ ลองอีกครั้งในภายหลัง Chrome ได้ประหยัดพื้นที่ให้คุณไป MB กลับไปด้านบน +เปิดเมนูเพื่อใช้แท็บใหม่ที่ไม่ระบุตัวตน รอดำเนินการ เพิ่มไปยังเรื่องรออ่าน {TAB_COUNT,plural, =1{ระบบจะปิดแท็บที่ไม่ระบุตัวตน แท็บและแท็บอื่นอีก แท็บ}other{ระบบจะปิดแท็บที่ไม่ระบุตัวตน แท็บและแท็บอื่นอีก แท็บ}} diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb index 0bd933a6d4b718..34676d1de48dbb 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-HK.xtb @@ -104,6 +104,7 @@ 複製使用者名稱 標準保護功能: {NUM_SELECTED,plural, =1{移除 1 個已選取的項目}other{移除 # 個已選取的項目}} +透過 Chrome 首頁探索新內容 安全瀏覽 您正在查看此網頁的離線版本 (建立時間:) 記錄 @@ -220,6 +221,7 @@ 拖曳滑桿,將文字調整到您閱讀時感到舒適的大小。當您輕按兩下文字段落,文字至少應有這樣大。 網站儲存空間資料量 無法登入 +Chrome 提示: 無法開啟攝錄機。發生錯誤。 如要搜尋,請輕觸並按住字詞 Chrome 使用的資料總量,包括帳戶、書籤和已儲存的設定 @@ -263,6 +265,7 @@ 系統會將您瀏覽的網址傳送至 Google 正在瀏覽此網頁的離線版本 Cookie 和網站數據 +如果不要將瀏覽活動儲存到裝置上,請使用無痕模式 影片預覽 圖片 對危險網站、下載檔案及擴充程式提供更快速的主動式保護功能 @@ -274,6 +277,7 @@ 信用卡號碼 已複製密碼 已節省 +瞭解如何將 Chrome 設為預設瀏覽器 連線可能會減慢下載速度 新增語言 您的瀏覽器由 管理 @@ -358,6 +362,7 @@ 正在追蹤價格 顯示登入 Chrome 的指示 之後可更快前往此網站 +已移動書籤 位置資訊功能已關閉,請在「Android 設定」中開啟此功能。 {BOOKMARKS_COUNT,plural, =1{ 個書籤}other{ 個書籤}} 您感興趣的文章和內容,一切盡在 Chrome @@ -386,6 +391,7 @@ 儲存至裝置 尚餘 1 分鐘 標準預先載入模式: +向下捲動以查看推薦文章 MM 如果您同時分享 Chrome 使用情況報告,這些報告將會包含您瀏覽的網址 圖片描述功能將會在連線至 Wi-Fi 時恢復運作 @@ -651,6 +657,7 @@ Chrome 沒有要求資源的存取權。 開啟列印網頁選項 正在顯示密碼產生彈出式視窗 +如要透過語音進行搜尋,請輕觸「麥克風」圖示 檢視 撥號 正在登入… @@ -697,6 +704,7 @@ 延伸使用情況資料 發生錯誤。 尚餘 1 小時 +移至 興趣 無痕式分頁 驗證信用卡 @@ -801,6 +809,7 @@ Chrome 需要儲存空間的存取權才能下載檔案。 關閉 不建議 只分享 GIF +你可以使用語音在 Chrome 中搜尋 無法重新整理「探索」 無痕式分頁 輕按即可複製此應用程式的網址 @@ -1012,6 +1021,7 @@ 登入 Chrome,開咗。 您與 Google 分享的資料 快速分享此頁面。如要編輯此捷徑,請按住捷徑按鈕。 +如要在所有裝置上取得你的 Google 設定,請登入帳戶 CVC ,分頁,已選取 停止追蹤價格 @@ -1050,6 +1060,7 @@ 還原咗 將 QR 碼/條碼放在此方框中。 密碼 +使用 Google 帳戶登入 Chrome chrome_image_ 要取得圖片說明嗎? 已禁止重新導向: @@ -1404,6 +1415,7 @@ - 無法下載此語言套件,請稍後再試。 Chrome 已為您節省 MB 返回頁首 +如要開啟新的無痕分頁,請按一下「選單」圖示 正在等待下載 加入閱讀清單 {TAB_COUNT,plural, =1{即將關閉 個無痕式分頁和另外 個分頁}other{即將關閉 個無痕式分頁和另外 個分頁}} diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb index fe3727f6761b8d..1030c144d8ab85 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_zh-TW.xtb @@ -104,6 +104,7 @@ 複製使用者名稱 標準防護: {NUM_SELECTED,plural, =1{移除 1 個選取的項目}other{移除 # 個選取的項目}} +透過 Chrome 首頁探索新內容 安全瀏覽 您目前瀏覽的是這個網頁的離線複本 (建立時間:) 歷史記錄 @@ -220,6 +221,7 @@ 拖曳滑桿,將文字調整到適當的字體大小。當你輕觸兩下文字段落時,瀏覽器至少應呈現這樣的字體大小。 網站儲存資料量 無法登入 +Chrome 提示: 無法開啟攝影機,發生錯誤。 如要進行搜尋,請按住要查詢的字詞 Chrome 使用的資料總量,包括帳戶、書籤和儲存的設定 @@ -263,6 +265,7 @@ 系統會將你造訪的網址傳送給 Google 目前瀏覽的是這個網頁的離線複本 Cookie 和網站資料 +如果不要將瀏覽活動儲存到裝置上,請使用無痕模式 影片預覽 圖片 針對不安全的網站、下載內容和擴充功能提供更快速的主動式防護機制 @@ -274,6 +277,7 @@ 卡號 已複製密碼 已節省 +瞭解如何將 Chrome 設為預設瀏覽器 連線可能會減慢下載速度 新增語言 你的瀏覽器是由 管理 @@ -358,6 +362,7 @@ 追蹤價格 顯示登入 Chrome 的提示 之後可更快前往這個網站 +已移動書籤 定位功能已關閉,請在 Android 設定中開啟這項功能。 {BOOKMARKS_COUNT,plural, =1{ 個書籤}other{ 個書籤}} 在 Chrome 上閱讀你有興趣的文章 @@ -386,6 +391,7 @@ 儲存到裝置 還剩 1 分鐘 標準預先載入模式: +向下捲動以查看推薦文章 如果你一併提供 Chrome 使用報告,這些報告中會包含你造訪的網址 圖片說明功能將在你連線至 Wi-Fi 後恢復運作 @@ -651,6 +657,7 @@ Chrome 無法存取要求的資源。 開啟列印網頁的選項 目前顯示的是密碼產生彈出式視窗 +如要透過語音進行搜尋,請輕觸「麥克風」圖示 檢視 撥號 登入中... @@ -697,6 +704,7 @@ 延伸使用資料 發生錯誤。 還剩 1 小時 +移至 興趣喜好 無痕式分頁 請驗證卡片 @@ -801,6 +809,7 @@ Chrome 必須取得儲存空間的存取權才能下載檔案。 關閉 不建議 僅分享 GIF +你可以使用語音在 Chrome 中搜尋 無法重新整理「探索」 無痕式分頁 輕觸即可複製這個應用程式的網址 @@ -1012,6 +1021,7 @@ Privacy Sandbox 的試用功能仍在積極開發階段,目前開放地區有 登入 Chrome,帳戶挑選器已開啟。 提供給 Google 的資訊 快速分享這個專頁。按住這裡即可編輯這個捷徑。 +如要在所有裝置上取得你的 Google 設定,請登入帳戶 信用卡驗證碼 」,分頁,已選取 停止追蹤價格 @@ -1050,6 +1060,7 @@ Privacy Sandbox 的試用功能仍在積極開發階段,目前開放地區有 已還原 將這個方框對準 QR 圖碼或條碼 密碼 +使用 Google 帳戶登入 Chrome chrome_image_ 要取得圖片說明嗎? 已禁止重新導向: @@ -1404,6 +1415,7 @@ Privacy Sandbox 的試用功能仍在積極開發階段,目前開放地區有 - 無法下載這個語言套件,請稍後再試。 Chrome 為你節省了 MB 返回頁首 +如要開啟新的無痕分頁,請按一下「選單」圖示 正在等待下載 加到閱讀清單 {TAB_COUNT,plural, =1{即將關閉 個無痕分頁和另外 個分頁}other{即將關閉 個無痕分頁和另外 個分頁}} diff --git a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc index 9929a615348cc3..e5a4b799fcf919 100644 --- a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc +++ b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc @@ -16,7 +16,7 @@ #include "chrome/browser/apps/app_service/launch_utils.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/file_manager/path_util.h" -#include "chrome/browser/ash/policy/dlp/dlp_content_manager.h" +#include "chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/platform_util.h" @@ -134,12 +134,12 @@ bool ChromeCaptureModeDelegate::Uses24HourFormat() const { } bool ChromeCaptureModeDelegate::IsCaptureModeInitRestrictedByDlp() const { - return policy::DlpContentManager::Get()->IsCaptureModeInitRestricted(); + return policy::DlpContentManagerAsh::Get()->IsCaptureModeInitRestricted(); } void ChromeCaptureModeDelegate::CheckCaptureModeInitRestrictionByDlp( ash::OnCaptureModeDlpRestrictionChecked callback) { - policy::DlpContentManager::Get()->CheckCaptureModeInitRestriction( + policy::DlpContentManagerAsh::Get()->CheckCaptureModeInitRestriction( std::move(callback)); } @@ -148,14 +148,14 @@ void ChromeCaptureModeDelegate::CheckCaptureOperationRestrictionByDlp( const gfx::Rect& bounds, ash::OnCaptureModeDlpRestrictionChecked callback) { const ScreenshotArea area = ConvertToScreenshotArea(window, bounds); - policy::DlpContentManager::Get()->CheckScreenshotRestriction( + policy::DlpContentManagerAsh::Get()->CheckScreenshotRestriction( area, std::move(callback)); } bool ChromeCaptureModeDelegate::IsCaptureAllowedByDlp( const aura::Window* window, const gfx::Rect& bounds) const { - return !policy::DlpContentManager::Get()->IsScreenshotRestricted( + return !policy::DlpContentManagerAsh::Get()->IsScreenshotRestricted( ConvertToScreenshotArea(window, bounds)); } @@ -167,18 +167,18 @@ void ChromeCaptureModeDelegate::StartObservingRestrictedContent( const aura::Window* window, const gfx::Rect& bounds, base::OnceClosure stop_callback) { - // The order here matters, since DlpContentManager::OnVideoCaptureStarted() + // The order here matters, since DlpContentManagerAsh::OnVideoCaptureStarted() // may call InterruptVideoRecordingIfAny() right away, so the callback must be // set first. interrupt_video_recording_callback_ = std::move(stop_callback); - policy::DlpContentManager::Get()->OnVideoCaptureStarted( + policy::DlpContentManagerAsh::Get()->OnVideoCaptureStarted( ConvertToScreenshotArea(window, bounds)); } void ChromeCaptureModeDelegate::StopObservingRestrictedContent( ash::OnCaptureModeDlpRestrictionChecked callback) { interrupt_video_recording_callback_.Reset(); - policy::DlpContentManager::Get()->CheckStoppedVideoCapture( + policy::DlpContentManagerAsh::Get()->CheckStoppedVideoCapture( std::move(callback)); } diff --git a/chrome/browser/ui/webui/chromeos/login/OWNERS b/chrome/browser/ui/webui/chromeos/login/OWNERS index 39af14ec6d6fc6..e1b8bcc2f8121f 100644 --- a/chrome/browser/ui/webui/chromeos/login/OWNERS +++ b/chrome/browser/ui/webui/chromeos/login/OWNERS @@ -1,5 +1,6 @@ # primary (in CET) antrim@chromium.org +raleksandrov@google.com rsorokin@chromium.org # secondary (in PST) diff --git a/chrome/browser/ui/webui/settings/chromeos/main_section.cc b/chrome/browser/ui/webui/settings/chromeos/main_section.cc index e58d188152b4ea..f0626caf2e4b27 100644 --- a/chrome/browser/ui/webui/settings/chromeos/main_section.cc +++ b/chrome/browser/ui/webui/settings/chromeos/main_section.cc @@ -162,7 +162,7 @@ void MainSection::AddLoadTimeData(content::WebUIDataSource* html_source) { html_source->AddBoolean( "isKioskModeActive", user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()); - html_source->AddBoolean("isSupervised", profile()->IsChild()); + html_source->AddBoolean("isChildAccount", profile()->IsChild()); html_source->AddBoolean( "appManagementIntentSettingsEnabled", diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 848e1e9d0af9b9..ef9ab1d61a504c 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -210,7 +210,7 @@ void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) { profile->IsGuestSession()); #endif - html_source->AddBoolean("isSupervised", profile->IsChild()); + html_source->AddBoolean("isChildAccount", profile->IsChild()); } void AddA11yStrings(content::WebUIDataSource* html_source) { diff --git a/chrome/browser/version/java/src/org/chromium/chrome/browser/version/ChromeVersionInfo.java b/chrome/browser/version/java/src/org/chromium/chrome/browser/version/ChromeVersionInfo.java index 5c1eb63b125221..027d729c53ac17 100644 --- a/chrome/browser/version/java/src/org/chromium/chrome/browser/version/ChromeVersionInfo.java +++ b/chrome/browser/version/java/src/org/chromium/chrome/browser/version/ChromeVersionInfo.java @@ -4,74 +4,9 @@ package org.chromium.chrome.browser.version; -import org.chromium.components.version_info.Channel; +import org.chromium.components.version_info.VersionInfo; /** - * A utility class for querying information about the current Chrome build. - * Intentionally doesn't depend on native so that the data can be accessed before - * libchrome.so is loaded. + * Compatibility shim for three-sided patch. */ -public class ChromeVersionInfo { - /** - * @return Whether this build is a local build. - */ - public static boolean isLocalBuild() { - return ChromeVersionConstants.CHANNEL == Channel.DEFAULT; - } - - /** - * @return Whether this build is a canary build. - */ - public static boolean isCanaryBuild() { - return ChromeVersionConstants.CHANNEL == Channel.CANARY; - } - - /** - * @return Whether this build is a dev build. - */ - public static boolean isDevBuild() { - return ChromeVersionConstants.CHANNEL == Channel.DEV; - } - - /** - * @return Whether this build is a beta build. - */ - public static boolean isBetaBuild() { - return ChromeVersionConstants.CHANNEL == Channel.BETA; - } - - /** - * @return Whether this build is a stable build. - */ - public static boolean isStableBuild() { - return ChromeVersionConstants.CHANNEL == Channel.STABLE; - } - - /** - * @return Whether this is an official (i.e. Google Chrome) build. - */ - public static boolean isOfficialBuild() { - return ChromeVersionConstants.IS_OFFICIAL_BUILD; - } - - /** - * @return The version number. - */ - public static String getProductVersion() { - return ChromeVersionConstants.PRODUCT_VERSION; - } - - /** - * @return The major version number. - */ - public static int getProductMajorVersion() { - return ChromeVersionConstants.PRODUCT_MAJOR_VERSION; - } - - /** - * @return The build number. - */ - public static int getBuildVersion() { - return ChromeVersionConstants.PRODUCT_BUILD_VERSION; - } -} +public class ChromeVersionInfo extends VersionInfo {} diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index 463b7603c779dc..5607ed5338dade 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt @@ -1 +1 @@ -chrome-linux-main-1639461558-09e87b99c7a6415f33ca3b3bf190cf5ca548d380.profdata +chrome-linux-main-1639483122-20e6b9acc183f41a276a93022da6f201498b4d81.profdata diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 6523aa2aea5c12..0f5c00244ccd44 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt @@ -1 +1 @@ -chrome-mac-main-1639461558-6443fe3ccc79dc1da48e31b902402cf517597db1.profdata +chrome-mac-main-1639483122-e06fa0da191d06543cc2bbb3b3801d304c46d5b0.profdata diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index fec086d409c072..c1d4c58849f2dc 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt @@ -1 +1 @@ -chrome-win32-main-1639461558-d1317f8df3a47076c53ad387642fd817bb433e6b.profdata +chrome-win32-main-1639483122-6c64e4735696edd79f94e428f8b51a0056079d88.profdata diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 6fdcae8fd9ae3a..4ad085a6601fd2 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt @@ -1 +1 @@ -chrome-win64-main-1639472251-f506982ae1e519a3e12d88863ff7ac127968c0f4.profdata +chrome-win64-main-1639483122-b852875a95ce2ee39f0bd733dae39836e0f19b13.profdata diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl index e6afd3d51db732..d3cc055d5780a3 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl @@ -261,7 +261,7 @@ namespace developerPrivate { boolean inDeveloperMode; boolean isDeveloperModeControlledByPolicy; boolean isIncognitoAvailable; - boolean isSupervised; + boolean isChildAccount; }; // DEPRECATED: Prefer ExtensionInfo. diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index daca7868be8c2a..da7a68bb5daa9b 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -3331,9 +3331,9 @@ if (!is_android && !is_fuchsia) { "../browser/ash/policy/display/device_display_cros_browser_test.h", "../browser/ash/policy/display/display_resolution_handler_browsertest.cc", "../browser/ash/policy/display/display_rotation_default_handler_browsertest.cc", - "../browser/ash/policy/dlp/dlp_content_manager_browsertest.cc", - "../browser/ash/policy/dlp/mock_dlp_content_manager.cc", - "../browser/ash/policy/dlp/mock_dlp_content_manager.h", + "../browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc", + "../browser/ash/policy/dlp/mock_dlp_content_manager_ash.cc", + "../browser/ash/policy/dlp/mock_dlp_content_manager_ash.h", "../browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc", "../browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc", "../browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc", diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn index 88cb00caa9b374..7b23f9f0770e37 100644 --- a/chrome/test/android/BUILD.gn +++ b/chrome/test/android/BUILD.gn @@ -338,7 +338,6 @@ android_library("chrome_java_test_support") { "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/messages/android:java", "//chrome/browser/util:java", - "//chrome/browser/version:java", "//components/bookmarks/common/android:bookmarks_java", "//components/browser_ui/notifications/android:test_support_java", "//components/browser_ui/styles/android:java", @@ -358,6 +357,7 @@ android_library("chrome_java_test_support") { "//components/signin/public/android:signin_java_test_support", "//components/sync/android:sync_java", "//components/translate/content/android:java", + "//components/version_info/android:version_constants_java", "//components/webapps/browser/android:java", "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java index 4eddbb6c41ab11..d719c0549b33c7 100644 --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java @@ -17,10 +17,10 @@ import org.chromium.base.StrictModeContext; import org.chromium.base.test.util.RestrictionSkipCheck; import org.chromium.base.test.util.SkipCheck; -import org.chromium.chrome.browser.version.ChromeVersionInfo; import org.chromium.chrome.test.util.ChromeRestriction; import org.chromium.chrome.test.util.browser.Features; import org.chromium.components.policy.test.annotations.Policies; +import org.chromium.components.version_info.VersionInfo; import org.chromium.content_public.browser.test.ContentJUnit4ClassRunner; import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.gms.ChromiumPlayServicesAvailability; @@ -159,7 +159,7 @@ protected boolean restrictionApplies(String restriction) { return true; } if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_OFFICIAL_BUILD) - && (!ChromeVersionInfo.isOfficialBuild())) { + && (!VersionInfo.isOfficialBuild())) { return true; } if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_DEVICE_DAYDREAM) diff --git a/chrome/test/data/webui/extensions/toolbar_test.js b/chrome/test/data/webui/extensions/toolbar_test.js index babafc65ff2ed1..cda75d4e20b462 100644 --- a/chrome/test/data/webui/extensions/toolbar_test.js +++ b/chrome/test/data/webui/extensions/toolbar_test.js @@ -37,7 +37,7 @@ suite(extension_toolbar_tests.suiteName, function() { document.body.appendChild(toolbar); toolbar.inDevMode = false; toolbar.devModeControlledByPolicy = false; - toolbar.isSupervised = false; + toolbar.isChildAccount = false; if (isChromeOS) { toolbar.kioskEnabled = false; } @@ -88,8 +88,8 @@ suite(extension_toolbar_tests.suiteName, function() { flush(); assertFalse(toggle.disabled); - // Test that the dev-mode toggle is disabled when the user is supervised. - toolbar.set('isSupervised', true); + // Test that the dev-mode toggle is disabled for child account users. + toolbar.set('isChildAccount', true); flush(); assertTrue(toggle.disabled); }); diff --git a/chrome/test/data/webui/settings/appearance_page_test.ts b/chrome/test/data/webui/settings/appearance_page_test.ts index eaac6d38319238..bbaba265648938 100644 --- a/chrome/test/data/webui/settings/appearance_page_test.ts +++ b/chrome/test/data/webui/settings/appearance_page_test.ts @@ -12,14 +12,14 @@ import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js'; class TestAppearanceBrowserProxy extends TestBrowserProxy implements AppearanceBrowserProxy { private defaultZoom_: number = 1; - private isSupervised_: boolean = false; + private isChildAccount_: boolean = false; private isHomeUrlValid_: boolean = true; constructor() { super([ 'getDefaultZoom', 'getThemeInfo', - 'isSupervised', + 'isChildAccount', 'useDefaultTheme', 'useSystemTheme', 'validateStartupPage', @@ -49,9 +49,9 @@ class TestAppearanceBrowserProxy extends TestBrowserProxy implements }); } - isSupervised() { - this.methodCalled('isSupervised'); - return this.isSupervised_; + isChildAccount() { + this.methodCalled('isChildAccount'); + return this.isChildAccount_; } useDefaultTheme() { @@ -66,8 +66,8 @@ class TestAppearanceBrowserProxy extends TestBrowserProxy implements this.defaultZoom_ = defaultZoom; } - setIsSupervised(isSupervised: boolean) { - this.isSupervised_ = isSupervised; + setIsChildAccount(isChildAccount: boolean) { + this.isChildAccount_ = isChildAccount; } validateStartupPage(url: string) { @@ -165,10 +165,10 @@ suite('AppearanceHandler', function() { // The "USE GTK+" button shouldn't be showing if it's already in use. assertFalse(!!appearancePage.shadowRoot!.querySelector('#useSystem')); - appearanceBrowserProxy.setIsSupervised(true); + appearanceBrowserProxy.setIsChildAccount(true); appearancePage.set(USE_SYSTEM_PREF, false); flush(); - // Supervised users have their own theme and can't use GTK+ theme. + // Child account users have their own theme and can't use GTK+ theme. assertFalse(!!appearancePage.shadowRoot!.querySelector('#useDefault')); assertFalse(!!appearancePage.shadowRoot!.querySelector('#useSystem')); // If there's no "USE" buttons, the container should be hidden. @@ -176,7 +176,7 @@ suite('AppearanceHandler', function() { appearancePage.shadowRoot! .querySelector('#themesSecondaryActions')!.hidden); - appearanceBrowserProxy.setIsSupervised(false); + appearanceBrowserProxy.setIsChildAccount(false); appearancePage.set(THEME_ID_PREF, 'fake theme id'); flush(); // If there's "USE" buttons again, the container should be visible. diff --git a/chrome/test/data/webui/settings/clear_browsing_data_test.ts b/chrome/test/data/webui/settings/clear_browsing_data_test.ts index 4878e41588cb7a..0d25101661affa 100644 --- a/chrome/test/data/webui/settings/clear_browsing_data_test.ts +++ b/chrome/test/data/webui/settings/clear_browsing_data_test.ts @@ -604,7 +604,7 @@ suite('ClearBrowsingDataAllPlatforms', function() { }); test('history rows are hidden for supervised users', function() { - assertFalse(loadTimeData.getBoolean('isSupervised')); + assertFalse(loadTimeData.getBoolean('isChildAccount')); assertFalse(element.shadowRoot! .querySelector( '#browsingCheckbox')!.hidden); @@ -617,7 +617,7 @@ suite('ClearBrowsingDataAllPlatforms', function() { element.remove(); testBrowserProxy.reset(); - loadTimeData.overrideValues({isSupervised: true}); + loadTimeData.overrideValues({isChildAccount: true}); element = document.createElement('settings-clear-browsing-data-dialog'); document.body.appendChild(element); diff --git a/chrome/updater/test/integration_test_commands.h b/chrome/updater/test/integration_test_commands.h index 29090b63ab8620..8a9464dab05f6d 100644 --- a/chrome/updater/test/integration_test_commands.h +++ b/chrome/updater/test/integration_test_commands.h @@ -60,7 +60,7 @@ class IntegrationTestCommands virtual void UpdateAll() const = 0; virtual void PrintLog() const = 0; virtual base::FilePath GetDifferentUserPath() const = 0; - virtual void WaitForServerExit() const = 0; + virtual void WaitForUpdaterExit() const = 0; #if defined(OS_WIN) virtual void ExpectInterfacesRegistered() const = 0; virtual void ExpectLegacyUpdate3WebSucceeds( diff --git a/chrome/updater/test/integration_test_commands_system.cc b/chrome/updater/test/integration_test_commands_system.cc index 16ebb5fe6b7eef..b016a44ed60d19 100644 --- a/chrome/updater/test/integration_test_commands_system.cc +++ b/chrome/updater/test/integration_test_commands_system.cc @@ -146,8 +146,8 @@ class IntegrationTestCommandsSystem : public IntegrationTestCommands { RunCommand("register_app", {Param("app_id", app_id)}); } - void WaitForServerExit() const override { - updater::test::WaitForServerExit(updater_scope_); + void WaitForUpdaterExit() const override { + updater::test::WaitForUpdaterExit(updater_scope_); } #if defined(OS_WIN) diff --git a/chrome/updater/test/integration_test_commands_user.cc b/chrome/updater/test/integration_test_commands_user.cc index cc1997a6888b6d..c70a01d53c992a 100644 --- a/chrome/updater/test/integration_test_commands_user.cc +++ b/chrome/updater/test/integration_test_commands_user.cc @@ -135,8 +135,8 @@ class IntegrationTestCommandsUser : public IntegrationTestCommands { updater::test::RegisterApp(updater_scope_, app_id); } - void WaitForServerExit() const override { - updater::test::WaitForServerExit(updater_scope_); + void WaitForUpdaterExit() const override { + updater::test::WaitForUpdaterExit(updater_scope_); } #if defined(OS_WIN) diff --git a/chrome/updater/test/integration_tests.cc b/chrome/updater/test/integration_tests.cc index f9fbc75b9373fb..be20f5ca4d1570 100644 --- a/chrome/updater/test/integration_tests.cc +++ b/chrome/updater/test/integration_tests.cc @@ -120,6 +120,7 @@ class IntegrationTest : public ::testing::Test { PrintLog(); CopyLog(); test_commands_->Uninstall(); + WaitForUpdaterExit(); } void ExpectCandidateUninstalled() { @@ -211,7 +212,7 @@ class IntegrationTest : public ::testing::Test { return test_commands_->GetDifferentUserPath(); } - void WaitForServerExit() { test_commands_->WaitForServerExit(); } + void WaitForUpdaterExit() { test_commands_->WaitForUpdaterExit(); } void SetUpTestService() { #if defined(OS_WIN) @@ -265,7 +266,7 @@ class IntegrationTest : public ::testing::Test { TEST_F(IntegrationTest, InstallUninstall) { Install(); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectInstalled(); ExpectVersionActive(kUpdaterVersion); ExpectActiveUpdater(); @@ -281,16 +282,12 @@ TEST_F(IntegrationTest, InstallUninstall) { TEST_F(IntegrationTest, SelfUninstallOutdatedUpdater) { Install(); ExpectInstalled(); - SleepFor(2); + WaitForUpdaterExit(); SetupFakeUpdaterHigherVersion(); ExpectVersionNotActive(kUpdaterVersion); RunWake(0); - - // The mac server will remain active for 10 seconds after it replies to the - // wake client, then shut down and uninstall itself. Sleep to wait for this - // to happen. - SleepFor(11); + WaitForUpdaterExit(); ExpectCandidateUninstalled(); // The candidate uninstall should not have altered global prefs. @@ -306,7 +303,7 @@ TEST_F(IntegrationTest, QualifyUpdater) { ExpectRegistrationEvent(&test_server, kUpdaterAppId); Install(); ExpectInstalled(); - WaitForServerExit(); + WaitForUpdaterExit(); SetupFakeUpdaterLowerVersion(); ExpectVersionNotActive(kUpdaterVersion); @@ -315,7 +312,7 @@ TEST_F(IntegrationTest, QualifyUpdater) { base::Version("0.2")); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); // This instance is now qualified and should activate itself and check itself // for updates on the next check. @@ -324,7 +321,7 @@ TEST_F(IntegrationTest, QualifyUpdater) { base::StringPrintf(".*%s.*", kUpdaterAppId))}, ")]}'\n"); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectVersionActive(kUpdaterVersion); Uninstall(); @@ -341,7 +338,7 @@ TEST_F(IntegrationTest, SelfUpdate) { base::Version(kUpdaterVersion), next_version); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectAppVersion(kUpdaterAppId, next_version); Uninstall(); @@ -404,7 +401,7 @@ TEST_F(IntegrationTest, UpdateApp) { base::Version v2("2"); ExpectUpdateSequence(&test_server, kAppId, v1, v2); Update(kAppId); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectAppVersion(kAppId, v2); Uninstall(); @@ -502,8 +499,7 @@ TEST_F(IntegrationTest, UninstallCmdLine) { ExpectActiveUpdater(); RunUninstallCmdLine(); - WaitForServerExit(); - SleepFor(2); + WaitForUpdaterExit(); ExpectClean(); } #endif // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -514,14 +510,14 @@ TEST_F(IntegrationTest, UnregisterUninstalledApp) { RegisterApp("test1"); RegisterApp("test2"); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectVersionActive(kUpdaterVersion); ExpectActiveUpdater(); SetExistenceCheckerPath("test1", base::FilePath(FILE_PATH_LITERAL("NONE"))); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectInstalled(); ExpectAppUnregisteredExistenceCheckerPath("test1"); @@ -530,12 +526,11 @@ TEST_F(IntegrationTest, UnregisterUninstalledApp) { TEST_F(IntegrationTest, UninstallIfMaxServerWakesBeforeRegistrationExceeded) { Install(); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectInstalled(); SetServerStarts(24); RunWake(0); - WaitForServerExit(); - SleepFor(2); + WaitForUpdaterExit(); ExpectClean(); } @@ -543,17 +538,16 @@ TEST_F(IntegrationTest, UninstallUpdaterWhenAllAppsUninstalled) { Install(); RegisterApp("test1"); ExpectInstalled(); - WaitForServerExit(); + WaitForUpdaterExit(); SetServerStarts(24); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectInstalled(); ExpectVersionActive(kUpdaterVersion); ExpectActiveUpdater(); SetExistenceCheckerPath("test1", base::FilePath(FILE_PATH_LITERAL("NONE"))); RunWake(0); - WaitForServerExit(); - SleepFor(2); + WaitForUpdaterExit(); ExpectClean(); } @@ -572,7 +566,7 @@ TEST_F(IntegrationTest, UnregisterUnownedApp) { SetExistenceCheckerPath("test1", GetDifferentUserPath()); RunWake(0); - WaitForServerExit(); + WaitForUpdaterExit(); ExpectAppUnregisteredExistenceCheckerPath("test1"); diff --git a/chrome/updater/test/integration_tests_impl.cc b/chrome/updater/test/integration_tests_impl.cc index 9ca520761f83a8..06e90b0abee0c1 100644 --- a/chrome/updater/test/integration_tests_impl.cc +++ b/chrome/updater/test/integration_tests_impl.cc @@ -313,18 +313,6 @@ bool Run(UpdaterScope scope, base::CommandLine command_line, int* exit_code) { return process.WaitForExitWithTimeout(base::Seconds(45), exit_code); } -void SleepFor(int seconds) { - VLOG(2) << "Sleeping " << seconds << " seconds..."; - base::WaitableEvent sleep(base::WaitableEvent::ResetPolicy::MANUAL, - base::WaitableEvent::InitialState::NOT_SIGNALED); - base::ThreadPool::PostDelayedTask( - FROM_HERE, {base::MayBlock()}, - base::BindOnce(&base::WaitableEvent::Signal, base::Unretained(&sleep)), - base::Seconds(seconds)); - sleep.Wait(); - VLOG(2) << "Sleep complete."; -} - bool WaitFor(base::RepeatingCallback predicate) { base::TimeTicks deadline = base::TimeTicks::Now() + TestTimeouts::action_max_timeout(); diff --git a/chrome/updater/test/integration_tests_impl.h b/chrome/updater/test/integration_tests_impl.h index dc8c38b043309a..7e5937895a53ac 100644 --- a/chrome/updater/test/integration_tests_impl.h +++ b/chrome/updater/test/integration_tests_impl.h @@ -51,11 +51,6 @@ void EnterTestMode(const GURL& url); // Copies the logs to a location where they can be retrieved by ResultDB. void CopyLog(const base::FilePath& src_dir); -// Sleeps for the given number of seconds. This should be avoided, but in some -// cases surrounding uninstall it is necessary since the processes can exit -// prior to completing the actual uninstallation. -void SleepFor(int seconds); - // Waits for a given predicate to become true, testing it by polling. Returns // true if the predicate becomes true before a timeout, otherwise returns false. bool WaitFor(base::RepeatingCallback predicate); @@ -143,7 +138,7 @@ void ExpectAppVersion(UpdaterScope scope, void RegisterApp(UpdaterScope scope, const std::string& app_id); -void WaitForServerExit(UpdaterScope scope); +void WaitForUpdaterExit(UpdaterScope scope); #if defined(OS_WIN) void ExpectInterfacesRegistered(UpdaterScope scope); diff --git a/chrome/updater/test/integration_tests_linux.cc b/chrome/updater/test/integration_tests_linux.cc index d4fb5b6795dc86..6850c64921d38f 100644 --- a/chrome/updater/test/integration_tests_linux.cc +++ b/chrome/updater/test/integration_tests_linux.cc @@ -27,7 +27,7 @@ absl::optional GetInstalledExecutablePath(UpdaterScope scope) { return absl::nullopt; } -void WaitForServerExit(UpdaterScope scope) { +void WaitForUpdaterExit(UpdaterScope scope) { NOTREACHED(); } diff --git a/chrome/updater/test/integration_tests_mac.mm b/chrome/updater/test/integration_tests_mac.mm index 89aa572bfc6612..4ff231403eab88 100644 --- a/chrome/updater/test/integration_tests_mac.mm +++ b/chrome/updater/test/integration_tests_mac.mm @@ -300,7 +300,7 @@ void ExpectNotActive(UpdaterScope scope, const std::string& app_id) { EXPECT_FALSE(base::PathIsWritable(*path)); } -void WaitForServerExit(UpdaterScope /*scope*/) { +void WaitForUpdaterExit(UpdaterScope /*scope*/) { ASSERT_TRUE(WaitFor(base::BindRepeating([]() { std::string ps_stdout; EXPECT_TRUE(base::GetAppOutput({"ps", "ax", "-o", "command"}, &ps_stdout)); diff --git a/chrome/updater/test/integration_tests_win.cc b/chrome/updater/test/integration_tests_win.cc index e7bbeacb6319ae..1a29f59ffefe53 100644 --- a/chrome/updater/test/integration_tests_win.cc +++ b/chrome/updater/test/integration_tests_win.cc @@ -290,8 +290,8 @@ void CheckInstallation(UpdaterScope scope, // Returns true is any updater process is found running in any session in the // system, regardless of its path. bool IsUpdaterRunning() { - ProcessFilterName filter(kUpdaterProcessName); - return base::ProcessIterator(&filter).NextProcessEntry(); + return IsProcessRunning(kUpdaterProcessName) || + IsProcessRunning(base::UTF8ToWide(kUninstallScript).c_str()); } } // namespace @@ -411,10 +411,6 @@ void Uninstall(UpdaterScope scope) { int exit_code = -1; ASSERT_TRUE(Run(scope, command_line, &exit_code)); EXPECT_EQ(0, exit_code); - - // Uninstallation involves a race with the uninstall.cmd script and the - // process exit. Sleep to allow the script to complete its work. - SleepFor(5); } void SetActive(UpdaterScope /*scope*/, const std::string& id) { @@ -450,7 +446,7 @@ void ExpectNotActive(UpdaterScope /*scope*/, const std::string& id) { // Waits for all updater processes to end, including the server process holding // the prefs lock. -void WaitForServerExit(UpdaterScope /*scope*/) { +void WaitForUpdaterExit(UpdaterScope /*scope*/) { WaitFor(base::BindRepeating([]() { return !IsUpdaterRunning(); })); } diff --git a/chromeos/constants/chromeos_features.cc b/chromeos/constants/chromeos_features.cc index aa7f2bbeef2baf..f9ff708c6eca90 100644 --- a/chromeos/constants/chromeos_features.cc +++ b/chromeos/constants/chromeos_features.cc @@ -17,7 +17,7 @@ namespace features { // Advertisement monitoring allows applications to register low energy scanners // that filter low energy advertisements in a power-efficient manner. const base::Feature kBluetoothAdvertisementMonitoring{ - "BluetoothAdvertisementMonitoring", base::FEATURE_DISABLED_BY_DEFAULT}; + "BluetoothAdvertisementMonitoring", base::FEATURE_ENABLED_BY_DEFAULT}; // Enables or disables more filtering out of phones from the Bluetooth UI. const base::Feature kBluetoothPhoneFilter{"BluetoothPhoneFilter", diff --git a/chromeos/profiles/atom.afdo.newest.txt b/chromeos/profiles/atom.afdo.newest.txt index e9fe5b4b7eaa89..efa35adbebef6a 100644 --- a/chromeos/profiles/atom.afdo.newest.txt +++ b/chromeos/profiles/atom.afdo.newest.txt @@ -1 +1 @@ -chromeos-chrome-amd64-atom-98-4729.0-1638787322-benchmark-98.0.4758.5-r1-redacted.afdo.xz +chromeos-chrome-amd64-atom-98-4744.1-1639393599-benchmark-98.0.4758.7-r1-redacted.afdo.xz diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb index 41662605be8b22..95bc7c9fede1d0 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_km.xtb @@ -49,6 +49,7 @@ អនុញ្ញាត​ខូគី ដើម្បីអនុញ្ញាតឱ្យ ចូលប្រើកាមេរ៉ា​របស់អ្នក អ្នកក៏ត្រូវបើក​កាមេរ៉ា​នៅក្នុង​ការកំណត់ Android ផងដែរ។ ម្តងប៉ុណ្ណោះ +ដក ចេញ សួរនៅពេលគេហទំព័រ​ចង់ស្វែងរកឧបករណ៍​ប៊្លូធូសដែលនៅជិត (បានណែនាំ) ការជ្រើសរើសវិញ្ញាបនបត្រសម្រាប់ម៉ាស៊ីនកូនមិនគាំទ្រដោយប្រព័ន្ធដំណើរការនេះទេ។ បន្ត diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_mn.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_mn.xtb index 12835488aea667..04c70a66b3f379 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_mn.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_mn.xtb @@ -49,6 +49,7 @@ Күүкиг зөвшөөрөх -д камертаа хандахыг зөвшөөрөхийн тулд камерыг мөн Андройдын тохиргоо-нд асаана уу. Ганц удаа +-г хасах Сайт ойролцоох Bluetooth төхөөрөмжийг илрүүлэх хүсэлтэй үед асуух (санал болгосон) Үйлчлүүлэгч талын сертификатын сонголтыг үйлдлийн системээс дэмжээгүй. Цааш diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_uz.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_uz.xtb index a288c43bb6d975..f26d01444b77b2 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_uz.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_uz.xtb @@ -49,6 +49,7 @@ Cookie fayllariga ruxsat berish kameradan foydalanishiga ruxsat berish uchun Android sozlamalari orqali kamerani yoqing. Bir marta +Olib tashlash: Sayt atrofdagi Bluetooth qurilmalarni tekshirmoqchi boʻlsa, xabar berilsin (tavsiya etiladi) Tanlangan mijoz sertifikati eskirgan va operatsion tizim tomonidan qo‘llab-quvvatlanmaydi. Davom etish diff --git a/components/content_capture/browser/content_capture_receiver_test.cc b/components/content_capture/browser/content_capture_receiver_test.cc index 88e2dd8802e383..ea3091990a6ad4 100644 --- a/components/content_capture/browser/content_capture_receiver_test.cc +++ b/components/content_capture/browser/content_capture_receiver_test.cc @@ -54,11 +54,11 @@ class ContentCaptureReceiverTest : public content::RenderViewHostTestHarness, // This needed to keep the WebContentsObserverConsistencyChecker checks // happy for when AppendChild is called. NavigateAndCommit(GURL(kMainFrameUrl)); - content_capture_sender_ = std::make_unique(); main_frame_ = web_contents()->GetMainFrame(); - // Binds sender with receiver. - OnscreenContentProvider::BindContentCaptureReceiver( - content_capture_sender_->GetPendingAssociatedReceiver(), main_frame_); + EXPECT_TRUE(main_frame_); + + main_frame_sender_ = std::make_unique(); + main_frame_sender_->Bind(main_frame_); helper_.InitTestData(kMainFrameUrl, kChildFrameUrl); } @@ -75,22 +75,12 @@ class ContentCaptureReceiverTest : public content::RenderViewHostTestHarness, } void SetupChildFrame() { - child_content_capture_sender_ = - std::make_unique(); - child_frame_ = - content::RenderFrameHostTester::For(main_frame_)->AppendChild("child"); - // Binds sender with receiver for child frame. - OnscreenContentProvider::BindContentCaptureReceiver( - child_content_capture_sender_->GetPendingAssociatedReceiver(), - child_frame_); - } + child_frame_ = content::RenderFrameHostTester::For(main_frame_.get()) + ->AppendChild("child"); + EXPECT_TRUE(child_frame_); - FakeContentCaptureSender* content_capture_sender() { - return content_capture_sender_.get(); - } - - FakeContentCaptureSender* child_content_capture_sender() { - return child_content_capture_sender_.get(); + child_frame_sender_ = std::make_unique(); + child_frame_sender_->Bind(child_frame_); } const std::vector& expected_removed_ids() const { @@ -143,34 +133,6 @@ class ContentCaptureReceiverTest : public content::RenderViewHostTestHarness, } } - void DidCaptureContent(const ContentCaptureData& captured_content, - bool first_data) { - base::RunLoop run_loop; - content_capture_sender()->DidCaptureContent(captured_content, first_data); - run_loop.RunUntilIdle(); - } - - void DidCaptureContentForChildFrame( - const ContentCaptureData& captured_content, - bool first_data) { - base::RunLoop run_loop; - child_content_capture_sender()->DidCaptureContent(captured_content, - first_data); - run_loop.RunUntilIdle(); - } - - void DidUpdateContent(const ContentCaptureData& updated_content) { - base::RunLoop run_loop; - content_capture_sender()->DidUpdateContent(updated_content); - run_loop.RunUntilIdle(); - } - - void DidRemoveContent(const std::vector& data) { - base::RunLoop run_loop; - content_capture_sender()->DidRemoveContent(data); - run_loop.RunUntilIdle(); - } - void BuildChildSession(const ContentCaptureSession& parent, const ContentCaptureFrame& data, ContentCaptureSession* child) { @@ -190,16 +152,26 @@ class ContentCaptureReceiverTest : public content::RenderViewHostTestHarness, return helper_.content_capture_consumer(); } + FakeContentCaptureSender* main_frame_sender() const { + return main_frame_sender_.get(); + } + FakeContentCaptureSender* child_frame_sender() const { + return child_frame_sender_.get(); + } + const ContentCaptureTestHelper* helper() const { return &helper_; } private: ContentCaptureTestHelper helper_; + // The sender for main frame. - std::unique_ptr content_capture_sender_; + std::unique_ptr main_frame_sender_; // The sender for child frame. - std::unique_ptr child_content_capture_sender_; + std::unique_ptr child_frame_sender_; + raw_ptr main_frame_ = nullptr; raw_ptr child_frame_ = nullptr; + // Expected removed Ids. std::vector expected_removed_ids_{2}; SessionRemovedTestHelper session_removed_test_helper_; @@ -211,7 +183,8 @@ INSTANTIATE_TEST_SUITE_P(, testing::Values(true, false)); TEST_P(ContentCaptureReceiverTest, DidCaptureContent) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), @@ -223,7 +196,8 @@ TEST_P(ContentCaptureReceiverTest, MultipleConsumers) { std::make_unique(nullptr); provider()->AddConsumer(*(consumer2.get())); - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), @@ -253,14 +227,16 @@ TEST_P(ContentCaptureReceiverTest, MultipleConsumers) { #define MAYBE_DidCaptureContentWithUpdate DidCaptureContentWithUpdate #endif TEST_P(ContentCaptureReceiverTest, MAYBE_DidCaptureContentWithUpdate) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); // Verifies to get test_data() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), consumer()->captured_data()); // Simulates to update the content within the same document. - DidCaptureContent(helper()->test_data_update(), false /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data_update(), + false /* first_data */); // Verifies to get test_data2() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); // Verifies that the session isn't removed. @@ -277,7 +253,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_DidCaptureContentWithUpdate) { #define MAYBE_DidUpdateContent DidUpdateContent #endif TEST_P(ContentCaptureReceiverTest, MAYBE_DidUpdateContent) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); ContentCaptureFrame expected_data = @@ -285,7 +262,7 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_DidUpdateContent) { EXPECT_EQ(expected_data, consumer()->captured_data()); // Simulate content change. - DidUpdateContent(helper()->test_data_change()); + main_frame_sender()->DidUpdateContent(helper()->test_data_change()); EXPECT_TRUE(consumer()->updated_parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestDataChange(expected_data.id), @@ -293,14 +270,16 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_DidUpdateContent) { } TEST_P(ContentCaptureReceiverTest, DidRemoveSession) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); // Verifies to get test_data() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), consumer()->captured_data()); // Simulates to navigate other document. - DidCaptureContent(helper()->test_data2(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); EXPECT_TRUE(consumer()->parent_session().empty()); // Verifies that the previous session was removed. EXPECT_EQ(1u, consumer()->removed_sessions().size()); @@ -313,14 +292,15 @@ TEST_P(ContentCaptureReceiverTest, DidRemoveSession) { } TEST_P(ContentCaptureReceiverTest, DidRemoveContent) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); // Verifies to get test_data() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), consumer()->captured_data()); // Simulates to remove the content. - DidRemoveContent(expected_removed_ids()); + main_frame_sender()->DidRemoveContent(expected_removed_ids()); EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); // Verifies that the removed_ids() was removed from the correct session. @@ -334,14 +314,16 @@ TEST_P(ContentCaptureReceiverTest, ChildFrameDidCaptureContent) { // Simulate add child frame. SetupChildFrame(); // Simulate to capture the content from main frame. - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); // Verifies to get test_data() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); EXPECT_EQ(GetExpectedTestData(true /* main_frame */), consumer()->captured_data()); // Simulate to capture the content from child frame. - DidCaptureContentForChildFrame(helper()->test_data2(), true /* first_data */); + child_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); // Verifies that the parent_session was set correctly. EXPECT_FALSE(consumer()->parent_session().empty()); std::vector expected{ @@ -362,9 +344,10 @@ TEST_P(ContentCaptureReceiverTest, RenderFrameHostGone) { // won't return WebContents. receiver->rfh_ = nullptr; // Ensure no crash. - DidCaptureContent(helper()->test_data(), true /* first_data */); - DidUpdateContent(helper()->test_data()); - DidRemoveContent(expected_removed_ids()); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); + main_frame_sender()->DidUpdateContent(helper()->test_data()); + main_frame_sender()->DidRemoveContent(expected_removed_ids()); } TEST_P(ContentCaptureReceiverTest, TitleUpdateTaskDelay) { @@ -380,7 +363,8 @@ TEST_P(ContentCaptureReceiverTest, TitleUpdateTaskDelay) { EXPECT_FALSE(task_runner->HasPendingTask()); // Capture content, then update the title. - DidCaptureContent(helper()->test_data(), /*first_data=*/true); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + /*first_data=*/true); std::u16string title2 = u"title 2"; receiver->SetTitle(title2); // A task should be scheduled. @@ -428,7 +412,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_ChildFrameCaptureContentFirst) { // Simulate add child frame. SetupChildFrame(); // Simulate to capture the content from child frame. - DidCaptureContentForChildFrame(helper()->test_data2(), true /* first_data */); + child_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); // Verifies that the parent_session was set correctly. EXPECT_FALSE(consumer()->parent_session().empty()); @@ -454,7 +439,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_ChildFrameCaptureContentFirst) { // When main frame navigates to same url, the parent session will not change. NavigateMainFrame(GURL(kMainFrameUrl)); SetupChildFrame(); - DidCaptureContentForChildFrame(helper()->test_data2(), true /* first_data */); + child_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); VerifySession(expected, consumer()->parent_session()); EXPECT_EQ(2u, consumer()->removed_sessions().size()); @@ -470,7 +456,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_ChildFrameCaptureContentFirst) { // When main frame navigates to same domain, the parent session will change. NavigateMainFrame(GURL(kMainFrameUrl2)); SetupChildFrame(); - DidCaptureContentForChildFrame(helper()->test_data2(), true /* first_data */); + child_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); // Intentionally reuse the data.id from previous result, so we know navigating // to same domain didn't create new ContentCaptureReceiver when call @@ -504,7 +491,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_ChildFrameCaptureContentFirst) { // change. NavigateMainFrame(GURL(kChildFrameUrl)); SetupChildFrame(); - DidCaptureContentForChildFrame(helper()->test_data2(), true /* first_data */); + child_frame_sender()->DidCaptureContent(helper()->test_data2(), + true /* first_data */); data = GetExpectedTestData2(true /* main_frame */); // Currently, there is no way to fake frame size, set it to 0. @@ -531,7 +519,8 @@ TEST_P(ContentCaptureReceiverTest, MAYBE_ChildFrameCaptureContentFirst) { } TEST_P(ContentCaptureReceiverTest, SameDocumentSameSession) { - DidCaptureContent(helper()->test_data(), true /* first_data */); + main_frame_sender()->DidCaptureContent(helper()->test_data(), + true /* first_data */); // Verifies to get test_data() with correct frame content id. EXPECT_TRUE(consumer()->parent_session().empty()); EXPECT_TRUE(consumer()->removed_sessions().empty()); diff --git a/components/content_capture/browser/content_capture_test_helper.cc b/components/content_capture/browser/content_capture_test_helper.cc index dc78ed110332f5..c008180433828c 100644 --- a/components/content_capture/browser/content_capture_test_helper.cc +++ b/components/content_capture/browser/content_capture_test_helper.cc @@ -10,25 +10,34 @@ FakeContentCaptureSender::FakeContentCaptureSender() = default; FakeContentCaptureSender::~FakeContentCaptureSender() = default; +void FakeContentCaptureSender::Bind(content::RenderFrameHost* frame) { + DCHECK(frame); + content_capture_receiver_.reset(); + OnscreenContentProvider::BindContentCaptureReceiver( + content_capture_receiver_.BindNewEndpointAndPassDedicatedReceiver(), + frame); +} + void FakeContentCaptureSender::DidCaptureContent( const ContentCaptureData& captured_content, bool first_data) { + base::RunLoop run_loop; content_capture_receiver_->DidCaptureContent(captured_content, first_data); + run_loop.RunUntilIdle(); } void FakeContentCaptureSender::DidUpdateContent( const ContentCaptureData& captured_content) { + base::RunLoop run_loop; content_capture_receiver_->DidUpdateContent(captured_content); + run_loop.RunUntilIdle(); } void FakeContentCaptureSender::DidRemoveContent( const std::vector& data) { + base::RunLoop run_loop; content_capture_receiver_->DidRemoveContent(data); -} - -mojo::PendingAssociatedReceiver -FakeContentCaptureSender::GetPendingAssociatedReceiver() { - return content_capture_receiver_.BindNewEndpointAndPassDedicatedReceiver(); + run_loop.RunUntilIdle(); } SessionRemovedTestHelper::SessionRemovedTestHelper() = default; diff --git a/components/content_capture/browser/content_capture_test_helper.h b/components/content_capture/browser/content_capture_test_helper.h index 3c9a5a668ff3c6..a06484ca16ccc5 100644 --- a/components/content_capture/browser/content_capture_test_helper.h +++ b/components/content_capture/browser/content_capture_test_helper.h @@ -17,6 +17,8 @@ class FakeContentCaptureSender { FakeContentCaptureSender(); virtual ~FakeContentCaptureSender(); + void Bind(content::RenderFrameHost* frame); + void DidCaptureContent(const ContentCaptureData& captured_content, bool first_data); @@ -24,9 +26,6 @@ class FakeContentCaptureSender { void DidRemoveContent(const std::vector& data); - mojo::PendingAssociatedReceiver - GetPendingAssociatedReceiver(); - private: mojo::AssociatedRemote content_capture_receiver_; diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc index b39fd6dae26f80..2c451bda79ae3f 100644 --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc @@ -38,7 +38,7 @@ namespace embedder_support { namespace { -constexpr char kMajorVersion100[] = "100"; +constexpr char kVersion100[] = "100"; #if defined(OS_WIN) @@ -126,7 +126,7 @@ const std::string& GetUniversalApiContractVersion() { const std::string& GetM100VersionNumber() { static const base::NoDestructor m100_version_number([] { base::Version version(version_info::GetVersionNumber()); - std::string version_str(kMajorVersion100); + std::string version_str(kVersion100); const std::vector& components = version.components(); // Rest of the version string remains the same. for (size_t i = 1; i < components.size(); ++i) { @@ -138,6 +138,28 @@ const std::string& GetM100VersionNumber() { return *m100_version_number; } +const std::string& GetM100InMinorVersionNumber() { + static const base::NoDestructor m100_version_number([] { + base::Version version(version_info::GetVersionNumber()); + std::string version_str; + const std::vector& components = version.components(); + // Rest of the version string remains the same. + for (size_t i = 0; i < components.size(); ++i) { + if (i > 0) { + version_str.append("."); + } + if (i == 1) { + // Populate "100" for the minor version. + version_str.append(kVersion100); + } else { + version_str.append(base::NumberToString(components[i])); + } + } + return version_str; + }()); + return *m100_version_number; +} + const blink::UserAgentBrandList GetUserAgentBrandList( const std::string& major_version, bool enable_updated_grease_by_policy, @@ -181,9 +203,9 @@ const blink::UserAgentBrandList GetUserAgentBrandMajorVersionList( blink::UserAgentBrandList GetForcedM100UserAgentBrandMajorVersionList( bool enable_updated_grease_by_policy) { - return GetUserAgentBrandList( - kMajorVersion100, enable_updated_grease_by_policy, GetM100VersionNumber(), - blink::UserAgentBrandVersionType::kMajorVersion); + return GetUserAgentBrandList(kVersion100, enable_updated_grease_by_policy, + GetM100VersionNumber(), + blink::UserAgentBrandVersionType::kMajorVersion); } blink::UserAgentBrandList GetUserAgentBrandFullVersionList( @@ -196,9 +218,9 @@ blink::UserAgentBrandList GetUserAgentBrandFullVersionList( blink::UserAgentBrandList GetForcedM100UserAgentBrandFullVersionList( bool enable_updated_grease_by_policy) { - return GetUserAgentBrandList( - kMajorVersion100, enable_updated_grease_by_policy, GetM100VersionNumber(), - blink::UserAgentBrandVersionType::kFullVersion); + return GetUserAgentBrandList(kVersion100, enable_updated_grease_by_policy, + GetM100VersionNumber(), + blink::UserAgentBrandVersionType::kFullVersion); } // Return UserAgentBrandList with the major version populated in the brand @@ -230,6 +252,10 @@ std::string GetProduct(const bool allow_version_override) { base::FeatureList::IsEnabled( blink::features::kForceMajorVersion100InUserAgent)) return "Chrome/" + GetM100VersionNumber(); + if (allow_version_override && + base::FeatureList::IsEnabled( + blink::features::kForceMinorVersion100InUserAgent)) + return "Chrome/" + GetM100InMinorVersionNumber(); return version_info::GetProductNameAndVersionForUserAgent(); } @@ -261,7 +287,7 @@ std::string GetReducedUserAgent() { switches::kUseMobileUserAgent), base::FeatureList::IsEnabled( blink::features::kForceMajorVersion100InUserAgent) - ? kMajorVersion100 + ? kVersion100 : version_info::GetMajorVersionNumber()); } diff --git a/components/embedder_support/user_agent_utils_unittest.cc b/components/embedder_support/user_agent_utils_unittest.cc index 0af60bbb416d3b..5129237f856972 100644 --- a/components/embedder_support/user_agent_utils_unittest.cc +++ b/components/embedder_support/user_agent_utils_unittest.cc @@ -779,4 +779,38 @@ TEST_P(UserAgentUtilsTest, GetUserAgent) { EXPECT_NE(minor_version, "0.0.0"); } +class UserAgentUtilsMinorVersionTest + : public testing::Test, + public testing::WithParamInterface { + public: + void SetUp() override { + if (ForceMinorVersionTo100()) + scoped_feature_list_.InitAndEnableFeature( + blink::features::kForceMinorVersion100InUserAgent); + } + + bool ForceMinorVersionTo100() { return GetParam(); } + + private: + base::test::ScopedFeatureList scoped_feature_list_; +}; + +INSTANTIATE_TEST_CASE_P(All, + UserAgentUtilsMinorVersionTest, + /*force_minor_version_to_M100*/ testing::Bool()); + +TEST_P(UserAgentUtilsMinorVersionTest, GetUserAgent) { + const std::string ua = GetUserAgent(); + std::string major_version; + std::string minor_version; + EXPECT_TRUE(re2::RE2::PartialMatch(ua, kChromeProductVersionRegex, + &major_version, &minor_version)); + EXPECT_EQ(major_version, version_info::GetMajorVersionNumber()); + if (ForceMinorVersionTo100()) { + EXPECT_NE(minor_version, "100.0.0"); + } else { + EXPECT_NE(minor_version, "0.0.0"); + } +} + } // namespace embedder_support diff --git a/components/permissions/permission_context_base_unittest.cc b/components/permissions/permission_context_base_unittest.cc index 6da2d3999bbd57..fe893242f45abc 100644 --- a/components/permissions/permission_context_base_unittest.cc +++ b/components/permissions/permission_context_base_unittest.cc @@ -803,7 +803,8 @@ TEST_F(PermissionContextBaseTests, TestGrantAndRevoke) { } // Tests the global kill switch by enabling/disabling the Field Trials. -TEST_F(PermissionContextBaseTests, TestGlobalKillSwitch) { +// TODO(crbug.com/1278842): Fix flaky test on Linux TSan. +TEST_F(PermissionContextBaseTests, DISABLED_TestGlobalKillSwitch) { TestGlobalPermissionsKillSwitch(ContentSettingsType::GEOLOCATION); TestGlobalPermissionsKillSwitch(ContentSettingsType::NOTIFICATIONS); TestGlobalPermissionsKillSwitch(ContentSettingsType::MIDI_SYSEX); diff --git a/components/signin/public/identity_manager/access_token_fetcher.cc b/components/signin/public/identity_manager/access_token_fetcher.cc index a49158ae2937c2..bb41d02c07fb2e 100644 --- a/components/signin/public/identity_manager/access_token_fetcher.cc +++ b/components/signin/public/identity_manager/access_token_fetcher.cc @@ -97,7 +97,7 @@ AccessTokenFetcher::AccessTokenFetcher( mode_(mode), callback_(std::move(callback)) { DCHECK(client_id_.empty() == client_secret_.empty()); - DCHECK(client_id_.empty() || !url_loader_factory); + DCHECK(client_id_.empty() || !url_loader_factory_); if (mode_ == Mode::kImmediate || IsRefreshTokenAvailable()) { StartAccessTokenRequest(); diff --git a/components/strings/components_strings_mn.xtb b/components/strings/components_strings_mn.xtb index 77b3de505478a3..aa7f28067c5424 100644 --- a/components/strings/components_strings_mn.xtb +++ b/components/strings/components_strings_mn.xtb @@ -2292,6 +2292,7 @@ Администраторын бодлогын дагуу руу хуваалцахыг блоклосон Утсаа хай Chrome-н тохиргоонд ямар мэдээлэл синк хийхээ удирдана уу +Зүрх төлбөр хариуцагч Эвдрэл () Та нууц үгүү хоёр удаа зөв оруулна уу. diff --git a/components/strings/components_strings_th.xtb b/components/strings/components_strings_th.xtb index 1cf1e0ee452579..732e81a7f98e86 100644 --- a/components/strings/components_strings_th.xtb +++ b/components/strings/components_strings_th.xtb @@ -2282,6 +2282,7 @@ นโยบายของผู้ดูแลระบบบล็อกการแชร์จาก ไปยัง ไว้ หาโทรศัพท์ของคุณ จัดการข้อมูลที่คุณซิงค์ในการตั้งค่า Chrome +หัวใจ เครื่องจัดการการชำระเงิน ข้อขัดข้อง () คุณต้องป้อนข้อความรหัสผ่านที่เหมือนกันสองครั้ง diff --git a/components/strings/components_strings_zh-HK.xtb b/components/strings/components_strings_zh-HK.xtb index cc50f10d8dd16a..5f8222acaf3799 100644 --- a/components/strings/components_strings_zh-HK.xtb +++ b/components/strings/components_strings_zh-HK.xtb @@ -2282,6 +2282,7 @@ 管理員政策已禁止將資料由 分享到 搜尋您的手機 在 Chrome 設定中管理同步哪些資料 +心形 付款處理常式 當機次數 () 您必須輸入兩次相同的複雜密碼。 diff --git a/components/strings/components_strings_zh-TW.xtb b/components/strings/components_strings_zh-TW.xtb index 8d5c94c89c4518..30690a6562dd2d 100644 --- a/components/strings/components_strings_zh-TW.xtb +++ b/components/strings/components_strings_zh-TW.xtb @@ -2283,6 +2283,7 @@ 系統管理員政策禁止將 的內容分享到 搜尋你的手機 在 Chrome 設定中管理要同步處理哪些資訊 +心形 付款處理常式 當機次數 () 你必須輸入兩次相同的通關密語。 diff --git a/components/version_info/android/BUILD.gn b/components/version_info/android/BUILD.gn index 469841848ecb1d..b83d435fb8ee3a 100644 --- a/components/version_info/android/BUILD.gn +++ b/components/version_info/android/BUILD.gn @@ -13,6 +13,7 @@ _version_constants_java_file = "$target_gen_dir/java/org/chromium/components/ver android_library("version_constants_java") { sources = [ "java/src/org/chromium/components/version_info/VersionConstantsBridge.java", + "java/src/org/chromium/components/version_info/VersionInfo.java", _version_constants_java_file, ] deps = [ diff --git a/components/version_info/android/java/src/org/chromium/components/version_info/VersionInfo.java b/components/version_info/android/java/src/org/chromium/components/version_info/VersionInfo.java new file mode 100644 index 00000000000000..ee94c6d662a98a --- /dev/null +++ b/components/version_info/android/java/src/org/chromium/components/version_info/VersionInfo.java @@ -0,0 +1,75 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.components.version_info; + +/** + * A utility class for querying information about the current Chromium build. + * Intentionally doesn't depend on native so that the data can be accessed before + * libchrome.so is loaded. + */ +public class VersionInfo { + /** + * @return Whether this build is a local build. + */ + public static boolean isLocalBuild() { + return VersionConstants.CHANNEL == Channel.DEFAULT; + } + + /** + * @return Whether this build is a canary build. + */ + public static boolean isCanaryBuild() { + return VersionConstants.CHANNEL == Channel.CANARY; + } + + /** + * @return Whether this build is a dev build. + */ + public static boolean isDevBuild() { + return VersionConstants.CHANNEL == Channel.DEV; + } + + /** + * @return Whether this build is a beta build. + */ + public static boolean isBetaBuild() { + return VersionConstants.CHANNEL == Channel.BETA; + } + + /** + * @return Whether this build is a stable build. + */ + public static boolean isStableBuild() { + return VersionConstants.CHANNEL == Channel.STABLE; + } + + /** + * @return Whether this is an official (i.e. non-development) build. + */ + public static boolean isOfficialBuild() { + return VersionConstants.IS_OFFICIAL_BUILD; + } + + /** + * @return The version number. + */ + public static String getProductVersion() { + return VersionConstants.PRODUCT_VERSION; + } + + /** + * @return The major version number. + */ + public static int getProductMajorVersion() { + return VersionConstants.PRODUCT_MAJOR_VERSION; + } + + /** + * @return The build number. + */ + public static int getBuildVersion() { + return VersionConstants.PRODUCT_BUILD_VERSION; + } +} diff --git a/content/browser/fenced_frame/fenced_frame_url_mapping.cc b/content/browser/fenced_frame/fenced_frame_url_mapping.cc index 6ce1454350b6e7..1e93bff00ac6f8 100644 --- a/content/browser/fenced_frame/fenced_frame_url_mapping.cc +++ b/content/browser/fenced_frame/fenced_frame_url_mapping.cc @@ -8,8 +8,8 @@ #include #include "base/check_op.h" +#include "base/guid.h" #include "base/strings/string_util.h" -#include "base/unguessable_token.h" #include "services/network/public/cpp/is_potentially_trustworthy.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/interest_group/ad_auction_constants.h" @@ -21,19 +21,25 @@ namespace content { namespace { GURL GenerateURN() { - return GURL(kURNUUIDprefix + base::UnguessableToken::Create().ToString()); + return GURL(kURNUUIDprefix + + base::GUID::GenerateRandomV4().AsLowercaseString()); } } // namespace const char kURNUUIDprefix[] = "urn:uuid:"; +const int kURNUUIDDashLocations[4] = {17, 22, 27, 32}; bool FencedFrameURLMapping::IsValidUrnUuidURL(const GURL& url) { if (!url.is_valid()) return false; std::string spec = url.spec(); return base::StartsWith(spec, kURNUUIDprefix, - base::CompareCase::INSENSITIVE_ASCII); + base::CompareCase::INSENSITIVE_ASCII) && + spec.at(kURNUUIDDashLocations[0]) == '-' && + spec.at(kURNUUIDDashLocations[1]) == '-' && + spec.at(kURNUUIDDashLocations[2]) == '-' && + spec.at(kURNUUIDDashLocations[3]) == '-'; } FencedFrameURLMapping::PendingAdComponentsMap::PendingAdComponentsMap( diff --git a/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc b/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc index 34da5c50d55214..0b7b77a42a52a0 100644 --- a/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc +++ b/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc @@ -4,6 +4,7 @@ #include "content/browser/fenced_frame/fenced_frame_url_mapping.h" +#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -115,7 +116,7 @@ TEST(FencedFrameURLMappingTest, AddAndConvert) { TEST(FencedFrameURLMappingTest, NonExistentUUID) { FencedFrameURLMapping fenced_frame_url_mapping; - GURL urn_uuid("urn:uuid:C36973B5E5D9DE59E4C4364F137B3C7A"); + GURL urn_uuid("urn:uuid:c36973b5-e5d9-de59-e4c4-364f137b3c7a"); absl::optional ad_components; absl::optional result = fenced_frame_url_mapping.ConvertFencedFrameURNToURL(urn_uuid, @@ -242,4 +243,23 @@ TEST( /*expected_mapped_urls=*/ad_component_urls); } +// Test the correctness of the URN format. The URN is expected to be in the +// format "urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" as per RFC-4122. +TEST(FencedFrameURLMappingTest, HasCorrectFormat) { + FencedFrameURLMapping fenced_frame_url_mapping; + GURL test_url("https://foo.test"); + GURL urn_uuid = fenced_frame_url_mapping.AddFencedFrameURL(test_url); + std::string spec = urn_uuid.spec(); + + ASSERT_TRUE(base::StartsWith( + spec, "urn:uuid:", base::CompareCase::INSENSITIVE_ASCII)); + + EXPECT_EQ(spec.at(17), '-'); + EXPECT_EQ(spec.at(22), '-'); + EXPECT_EQ(spec.at(27), '-'); + EXPECT_EQ(spec.at(32), '-'); + + EXPECT_TRUE(fenced_frame_url_mapping.IsValidUrnUuidURL(urn_uuid)); +} + } // namespace content diff --git a/content/browser/interest_group/auction_runner.cc b/content/browser/interest_group/auction_runner.cc index b4fa0e7693ab29..76430ad895e9dc 100644 --- a/content/browser/interest_group/auction_runner.cc +++ b/content/browser/interest_group/auction_runner.cc @@ -255,6 +255,7 @@ void AuctionRunner::OnSellerWorkletProcessReceived() { base::Unretained(delegate_)), browser_signals_->top_frame_origin, frame_origin_, /*is_for_seller_=*/true, delegate_->GetClientSecurityState(), seller_url, + /*wasm_url=*/absl::nullopt, /*trusted_signals_base_url=*/ auction_config_->trusted_scoring_signals_url); mojo::PendingReceiver @@ -652,6 +653,7 @@ void AuctionRunner::LoadBidderWorklet(BidState& bid_state, base::Unretained(delegate_)), browser_signals_->top_frame_origin, frame_origin_, /*is_for_seller=*/false, delegate_->GetClientSecurityState(), bidding_url, + bid_state.bidder.bidding_group->group.bidding_wasm_helper_url, bidder->group.trusted_bidding_signals_url); mojo::PendingReceiver diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy.cc b/content/browser/interest_group/auction_url_loader_factory_proxy.cc index af3dd5f040022a..1ecd5996cc6904 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy.cc +++ b/content/browser/interest_group/auction_url_loader_factory_proxy.cc @@ -41,6 +41,7 @@ AuctionURLLoaderFactoryProxy::AuctionURLLoaderFactoryProxy( bool is_for_seller, network::mojom::ClientSecurityStatePtr client_security_state, const GURL& script_url, + const absl::optional& wasm_url, const absl::optional& trusted_signals_base_url) : receiver_(this, std::move(pending_receiver)), get_frame_url_loader_factory_(std::move(get_frame_url_loader_factory)), @@ -51,6 +52,7 @@ AuctionURLLoaderFactoryProxy::AuctionURLLoaderFactoryProxy( is_for_seller_(is_for_seller), client_security_state_(std::move(client_security_state)), script_url_(script_url), + wasm_url_(wasm_url), trusted_signals_base_url_(trusted_signals_base_url) { DCHECK(client_security_state_); } @@ -78,6 +80,9 @@ void AuctionURLLoaderFactoryProxy::CreateLoaderAndStart( if (url_request.url == script_url_ && accept_header == "application/javascript") { is_request_allowed = true; + } else if (wasm_url_.has_value() && url_request.url == wasm_url_.value() && + accept_header == "application/wasm") { + is_request_allowed = true; } else if (CouldBeTrustedSignalsUrl(url_request.url) && accept_header == "application/json") { is_request_allowed = true; diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy.h b/content/browser/interest_group/auction_url_loader_factory_proxy.h index 36e7b6fa73eb27..e2ea9a88559594 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy.h +++ b/content/browser/interest_group/auction_url_loader_factory_proxy.h @@ -53,9 +53,10 @@ class CONTENT_EXPORT AuctionURLLoaderFactoryProxy // bidder worklets. Ignored for seller worklets, since they use a // URLLoaderFactory with that information already attached. // - // `script_url` is the Javascript URL for the worklet, and - // `trusted_signals_url` is the optional JSON url for additional input to the - // script. No other URLs may be requested. + // `script_url` is the Javascript URL for the worklet, `wasm_url` is a URL + // for an optional WASM helper for the worklet, and `trusted_signals_url` is + // the optional JSON url for additional input to the script. No other URLs may + // be requested. AuctionURLLoaderFactoryProxy( mojo::PendingReceiver pending_receiver, GetUrlLoaderFactoryCallback get_frame_url_loader_factory, @@ -65,6 +66,7 @@ class CONTENT_EXPORT AuctionURLLoaderFactoryProxy bool is_for_seller, network::mojom::ClientSecurityStatePtr client_security_state, const GURL& script_url, + const absl::optional& wasm_url, const absl::optional& trusted_signals_base_url); AuctionURLLoaderFactoryProxy(const AuctionURLLoaderFactoryProxy&) = delete; AuctionURLLoaderFactoryProxy& operator=(const AuctionURLLoaderFactoryProxy&) = @@ -106,6 +108,7 @@ class CONTENT_EXPORT AuctionURLLoaderFactoryProxy net::IsolationInfo isolation_info_for_seller_signals_; const GURL script_url_; + const absl::optional wasm_url_; const absl::optional trusted_signals_base_url_; }; diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc b/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc index 37fd43bccff13d..257344a878d48c 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc +++ b/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc @@ -33,6 +33,7 @@ namespace content { const char kScriptUrl[] = "https://host.test/script"; +const char kWasmUrl[] = "https://host.test/wasm"; const char kTrustedSignalsBaseUrl[] = "https://host.test/trusted_signals"; // Basic example of a trusted signals URL. Seller signals typically have URLs as // keys, but AuctionUrlLoaderProxy doesn't currently verify that. @@ -43,8 +44,9 @@ const char kTrustedSignalsUrl[] = const char kAcceptJavascript[] = "application/javascript"; const char kAcceptJson[] = "application/json"; const char kAcceptOther[] = "binary/ocelot-stream"; +const char kAcceptWasm[] = "application/wasm"; -class ActionUrlLoaderFactoryProxyTest : public testing::Test { +class AuctionUrlLoaderFactoryProxyTest : public testing::Test { public: // Ways the proxy can behave in response to a request. enum class ExpectedResponse { @@ -52,13 +54,13 @@ class ActionUrlLoaderFactoryProxyTest : public testing::Test { kAllow, }; - ActionUrlLoaderFactoryProxyTest() { + AuctionUrlLoaderFactoryProxyTest() { // Other defaults are all reasonable, but this should always be true for // FLEDGE. client_security_state_->is_web_secure_context = true; } - ~ActionUrlLoaderFactoryProxyTest() override = default; + ~AuctionUrlLoaderFactoryProxyTest() override = default; void CreateUrlLoaderFactoryProxy() { // The AuctionURLLoaderFactoryProxy should only be created if there is no @@ -76,7 +78,7 @@ class ActionUrlLoaderFactoryProxyTest : public testing::Test { [](network::mojom::URLLoaderFactory* factory) { return factory; }, &trusted_url_loader_factory_), top_frame_origin_, frame_origin_, is_for_seller_, - client_security_state_.Clone(), GURL(kScriptUrl), + client_security_state_.Clone(), GURL(kScriptUrl), wasm_url_, trusted_signals_base_url_); } @@ -205,9 +207,11 @@ class ActionUrlLoaderFactoryProxyTest : public testing::Test { EXPECT_EQ(network::mojom::RequestMode::kNoCors, observed_request.mode); if (is_for_seller_) { - if (original_accept_header == kAcceptJavascript) { - // Seller worklet Javascript requests use the renderer's untrusted - // URLLoaderFactory, so inherit security parameters from there. + if (original_accept_header == kAcceptJavascript || + original_accept_header == kAcceptWasm) { + // Seller worklet Javascript & WASM requests use the renderer's + // untrusted URLLoaderFactory, so inherit security parameters from + // there. EXPECT_FALSE(trusted_factory_used); EXPECT_FALSE(observed_request.trusted_params); } else { @@ -266,6 +270,7 @@ class ActionUrlLoaderFactoryProxyTest : public testing::Test { const network::mojom::ClientSecurityStatePtr client_security_state_ = network::mojom::ClientSecurityState::New(); absl::optional trusted_signals_base_url_ = GURL(kTrustedSignalsBaseUrl); + absl::optional wasm_url_ = GURL(kWasmUrl); url::Origin top_frame_origin_ = url::Origin::Create(GURL("https://top.test/")); @@ -277,7 +282,7 @@ class ActionUrlLoaderFactoryProxyTest : public testing::Test { mojo::Remote remote_url_loader_factory_; }; -TEST_F(ActionUrlLoaderFactoryProxyTest, Basic) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, Basic) { for (bool is_for_seller : {false, true}) { is_for_seller_ = is_for_seller; // Force creation of a new proxy, with correct `is_for_seller` value. @@ -287,27 +292,47 @@ TEST_F(ActionUrlLoaderFactoryProxyTest, Basic) { TryMakeRequest(kScriptUrl, kAcceptJavascript, ExpectedResponse::kAllow); TryMakeRequest(kScriptUrl, kAcceptJson, ExpectedResponse::kReject); TryMakeRequest(kScriptUrl, kAcceptOther, ExpectedResponse::kReject); + TryMakeRequest(kScriptUrl, kAcceptWasm, ExpectedResponse::kReject); TryMakeRequest(kScriptUrl, absl::nullopt, ExpectedResponse::kReject); TryMakeRequest(kTrustedSignalsUrl, kAcceptJavascript, ExpectedResponse::kReject); TryMakeRequest(kTrustedSignalsUrl, kAcceptJson, ExpectedResponse::kAllow); TryMakeRequest(kTrustedSignalsUrl, kAcceptOther, ExpectedResponse::kReject); + TryMakeRequest(kTrustedSignalsUrl, kAcceptWasm, ExpectedResponse::kReject); TryMakeRequest(kTrustedSignalsUrl, absl::nullopt, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptJavascript, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptJson, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptOther, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptWasm, ExpectedResponse::kAllow); + TryMakeRequest(kWasmUrl, absl::nullopt, ExpectedResponse::kReject); + TryMakeRequest("https://host.test/", kAcceptJavascript, ExpectedResponse::kReject); TryMakeRequest("https://host.test/", kAcceptJson, ExpectedResponse::kReject); TryMakeRequest("https://host.test/", kAcceptOther, ExpectedResponse::kReject); + TryMakeRequest("https://host.test/", kAcceptWasm, + ExpectedResponse::kReject); TryMakeRequest("https://host.test/", absl::nullopt, ExpectedResponse::kReject); } } -TEST_F(ActionUrlLoaderFactoryProxyTest, NoTrustedSignalsUrl) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, NoWasmUrl) { + wasm_url_ = absl::nullopt; + CreateUrlLoaderFactoryProxy(); + TryMakeRequest(kWasmUrl, kAcceptJavascript, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptJson, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptOther, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, kAcceptWasm, ExpectedResponse::kReject); + TryMakeRequest(kWasmUrl, absl::nullopt, ExpectedResponse::kReject); +} + +TEST_F(AuctionUrlLoaderFactoryProxyTest, NoTrustedSignalsUrl) { trusted_signals_base_url_ = absl::nullopt; for (bool is_for_seller : {false, true}) { @@ -349,7 +374,7 @@ TEST_F(ActionUrlLoaderFactoryProxyTest, NoTrustedSignalsUrl) { } // This test focuses on validation of the requested trusted signals URLs. -TEST_F(ActionUrlLoaderFactoryProxyTest, TrustedSignalsUrl) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, TrustedSignalsUrl) { for (bool is_for_seller : {false, true}) { is_for_seller_ = is_for_seller; // Force creation of a new proxy, with correct `is_for_seller` value. @@ -439,7 +464,7 @@ TEST_F(ActionUrlLoaderFactoryProxyTest, TrustedSignalsUrl) { // Make sure all seller signals requests use the same transient // NetworkIsolationKey. -TEST_F(ActionUrlLoaderFactoryProxyTest, SellerSignalsNetworkIsolationKey) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, SellerSignalsNetworkIsolationKey) { is_for_seller_ = true; // Make 20 JSON requests, 10 with the same URL, 10 with different ones. All // should be plumbed through successfully. @@ -465,7 +490,7 @@ TEST_F(ActionUrlLoaderFactoryProxyTest, SellerSignalsNetworkIsolationKey) { // Test the case the same URL is used for trusted signals and the script (which // seems weird, but should still work). -TEST_F(ActionUrlLoaderFactoryProxyTest, SameUrl) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, SameUrl) { trusted_signals_base_url_ = GURL(kScriptUrl); for (bool is_for_seller : {false, true}) { @@ -501,7 +526,7 @@ TEST_F(ActionUrlLoaderFactoryProxyTest, SameUrl) { // Make sure that proxies for bidder worklets pass through ClientSecurityState. // This test relies on the ClientSecurityState equality check in // TryMakeRequest(). -TEST_F(ActionUrlLoaderFactoryProxyTest, ClientSecurityState) { +TEST_F(AuctionUrlLoaderFactoryProxyTest, ClientSecurityState) { is_for_seller_ = false; for (auto ip_address_space : {network::mojom::IPAddressSpace::kLocal, diff --git a/content/browser/interest_group/interest_group_storage.cc b/content/browser/interest_group/interest_group_storage.cc index 816f1717c92323..6180b796e9d9c3 100644 --- a/content/browser/interest_group/interest_group_storage.cc +++ b/content/browser/interest_group/interest_group_storage.cc @@ -51,21 +51,23 @@ const base::FilePath::CharType kDatabasePath[] = // Version 3 - 2021/09 - crrev.com/c/3165576 // Version 4 - 2021/10 - crrev.com/c/3172863 // Version 5 - 2021/10 - crrev.com/c/3067804 +// Version 6 - 2021/12 - crrev.com/c/3330516 // // Version 1 adds a table for interest groups. // Version 2 adds a column for rate limiting interest group updates. // Version 3 adds a field for ad components. // Version 4 adds joining origin and url. // Version 5 adds k-anonymity tables and fields. -const int kCurrentVersionNumber = 5; +// Version 6 adds WebAssembly helper url. +const int kCurrentVersionNumber = 6; // Earliest version of the code which can use a |kCurrentVersionNumber| // database without failing. -const int kCompatibleVersionNumber = 5; +const int kCompatibleVersionNumber = 6; // Latest version of the database that cannot be upgraded to // |kCurrentVersionNumber| without razing the database. -const int kDeprecatedVersionNumber = 4; +const int kDeprecatedVersionNumber = 5; enum class KAnonType { kOwnerAndName = 1, @@ -174,7 +176,7 @@ absl::optional> DeserializeStringVector( // Initializes the tables, returning true on success. // The tables cannot exist when calling this function. -bool CreateV5Schema(sql::Database& db) { +bool CreateV6Schema(sql::Database& db) { DCHECK(!db.DoesTableExist("interest_groups")); static const char kInterestGroupTableSql[] = // clang-format off @@ -187,6 +189,7 @@ bool CreateV5Schema(sql::Database& db) { "name TEXT NOT NULL," "joining_url TEXT NOT NULL," "bidding_url TEXT NOT NULL," + "bidding_wasm_helper_url TEXT NOT NULL," "update_url TEXT NOT NULL," "trusted_bidding_signals_url TEXT NOT NULL," "trusted_bidding_signals_keys TEXT NOT NULL," @@ -476,13 +479,14 @@ bool DoJoinInterestGroup(sql::Database& db, "name," "joining_url," "bidding_url," + "bidding_wasm_helper_url," "update_url," "trusted_bidding_signals_url," "trusted_bidding_signals_keys," "user_bidding_signals," // opaque data "ads," "ad_components) " - "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")); + "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")); // clang-format on if (!join_group.is_valid()) @@ -497,16 +501,17 @@ bool DoJoinInterestGroup(sql::Database& db, join_group.BindString(5, data.name); join_group.BindString(6, Serialize(joining_url)); join_group.BindString(7, Serialize(data.bidding_url)); - join_group.BindString(8, Serialize(data.update_url)); - join_group.BindString(9, Serialize(data.trusted_bidding_signals_url)); - join_group.BindString(10, Serialize(data.trusted_bidding_signals_keys)); + join_group.BindString(8, Serialize(data.bidding_wasm_helper_url)); + join_group.BindString(9, Serialize(data.update_url)); + join_group.BindString(10, Serialize(data.trusted_bidding_signals_url)); + join_group.BindString(11, Serialize(data.trusted_bidding_signals_keys)); if (data.user_bidding_signals) { - join_group.BindString(11, data.user_bidding_signals.value()); + join_group.BindString(12, data.user_bidding_signals.value()); } else { - join_group.BindNull(11); + join_group.BindNull(12); } - join_group.BindString(12, Serialize(data.ads)); - join_group.BindString(13, Serialize(data.ad_components)); + join_group.BindString(13, Serialize(data.ads)); + join_group.BindString(14, Serialize(data.ad_components)); if (!join_group.Run()) return false; @@ -544,6 +549,7 @@ bool DoLoadInterestGroup(sql::Database& db, db.GetCachedStatement(SQL_FROM_HERE, "SELECT expiration," "bidding_url," + "bidding_wasm_helper_url," "update_url," "trusted_bidding_signals_url," "trusted_bidding_signals_keys," @@ -568,14 +574,15 @@ bool DoLoadInterestGroup(sql::Database& db, group.owner = owner; group.name = name; group.bidding_url = DeserializeURL(load.ColumnString(1)); - group.update_url = DeserializeURL(load.ColumnString(2)); - group.trusted_bidding_signals_url = DeserializeURL(load.ColumnString(3)); + group.bidding_wasm_helper_url = DeserializeURL(load.ColumnString(2)); + group.update_url = DeserializeURL(load.ColumnString(3)); + group.trusted_bidding_signals_url = DeserializeURL(load.ColumnString(4)); group.trusted_bidding_signals_keys = - DeserializeStringVector(load.ColumnString(4)); - if (load.GetColumnType(5) != sql::ColumnType::kNull) - group.user_bidding_signals = load.ColumnString(5); - group.ads = DeserializeInterestGroupAdVector(load.ColumnString(6)); - group.ad_components = DeserializeInterestGroupAdVector(load.ColumnString(7)); + DeserializeStringVector(load.ColumnString(5)); + if (load.GetColumnType(6) != sql::ColumnType::kNull) + group.user_bidding_signals = load.ColumnString(6); + group.ads = DeserializeInterestGroupAdVector(load.ColumnString(7)); + group.ad_components = DeserializeInterestGroupAdVector(load.ColumnString(8)); return true; } @@ -589,6 +596,7 @@ bool DoStoreInterestGroupUpdate(sql::Database& db, "UPDATE interest_groups " "SET last_updated=?," "bidding_url=?," + "bidding_wasm_helper_url=?," "update_url=?," "trusted_bidding_signals_url=?," "trusted_bidding_signals_keys=?," @@ -603,13 +611,14 @@ bool DoStoreInterestGroupUpdate(sql::Database& db, store_group.Reset(true); store_group.BindTime(0, last_updated); store_group.BindString(1, Serialize(group.bidding_url)); - store_group.BindString(2, Serialize(group.update_url)); - store_group.BindString(3, Serialize(group.trusted_bidding_signals_url)); - store_group.BindString(4, Serialize(group.trusted_bidding_signals_keys)); - store_group.BindString(5, Serialize(group.ads)); - store_group.BindString(6, Serialize(group.ad_components)); - store_group.BindString(7, Serialize(group.owner)); - store_group.BindString(8, group.name); + store_group.BindString(2, Serialize(group.bidding_wasm_helper_url)); + store_group.BindString(3, Serialize(group.update_url)); + store_group.BindString(4, Serialize(group.trusted_bidding_signals_url)); + store_group.BindString(5, Serialize(group.trusted_bidding_signals_keys)); + store_group.BindString(6, Serialize(group.ads)); + store_group.BindString(7, Serialize(group.ad_components)); + store_group.BindString(8, Serialize(group.owner)); + store_group.BindString(9, group.name); return store_group.Run(); } @@ -640,6 +649,8 @@ bool DoUpdateInterestGroup(sql::Database& db, if (update.bidding_url) stored_group.bidding_url = update.bidding_url; + if (update.bidding_wasm_helper_url) + stored_group.bidding_wasm_helper_url = update.bidding_wasm_helper_url; if (update.trusted_bidding_signals_url) stored_group.trusted_bidding_signals_url = update.trusted_bidding_signals_url; @@ -1566,7 +1577,7 @@ bool InterestGroupStorage::InitializeSchema() { return false; if (new_db) - return CreateV5Schema(*db_); + return CreateV6Schema(*db_); const int db_version = meta_table.GetVersionNumber(); diff --git a/content/browser/interest_group/interest_group_storage_unittest.cc b/content/browser/interest_group/interest_group_storage_unittest.cc index 1b2070e52be4e9..2930234bbc5b08 100644 --- a/content/browser/interest_group/interest_group_storage_unittest.cc +++ b/content/browser/interest_group/interest_group_storage_unittest.cc @@ -680,6 +680,7 @@ TEST_F(InterestGroupStorageTest, StoresAllFields) { full.name = "full"; full.expiry = base::Time::Now() + base::Days(30); full.bidding_url = GURL("https://full.example.com/bid"); + full.bidding_wasm_helper_url = GURL("https://full.example.com/bid_wasm"); full.update_url = GURL("https://full.example.com/update"); full.trusted_bidding_signals_url = GURL("https://full.example.com/signals"); full.trusted_bidding_signals_keys = @@ -711,6 +712,25 @@ TEST_F(InterestGroupStorageTest, StoresAllFields) { ASSERT_EQ(1u, storage_interest_groups.size()); EXPECT_TRUE( full.IsEqualForTesting(storage_interest_groups[0].bidding_group->group)); + + // Test update as well. + InterestGroup updated = full; + updated.bidding_url = GURL("https://full.example.com/bid2"); + updated.bidding_wasm_helper_url = GURL("https://full.example.com/bid_wasm2"); + updated.trusted_bidding_signals_url = + GURL("https://full.example.com/signals2"); + updated.trusted_bidding_signals_keys = + absl::make_optional(std::vector{"a", "b2", "c", "d"}); + updated.ads->emplace_back(blink::InterestGroup::Ad( + GURL("https://full.example.com/ad3"), "metadata3")); + updated.ad_components->emplace_back(blink::InterestGroup::Ad( + GURL("https://full.example.com/adcomponent3"), "metadata3c")); + storage->UpdateInterestGroup(updated); + + storage_interest_groups = storage->GetInterestGroupsForOwner(full_origin); + ASSERT_EQ(1u, storage_interest_groups.size()); + EXPECT_TRUE(updated.IsEqualForTesting( + storage_interest_groups[0].bidding_group->group)); } TEST_F(InterestGroupStorageTest, DeleteOriginDeleteAll) { diff --git a/content/browser/renderer_host/frame_tree_browsertest.cc b/content/browser/renderer_host/frame_tree_browsertest.cc index 7b84d3b064b5cc..783f3af9d91661 100644 --- a/content/browser/renderer_host/frame_tree_browsertest.cc +++ b/content/browser/renderer_host/frame_tree_browsertest.cc @@ -1838,7 +1838,7 @@ IN_PROC_BROWSER_TEST_P(FencedFrameTreeBrowserTest, CheckInvalidUrnError) { FrameTreeNode* fenced_frame_root_node = GetFencedFrameRootNode(root->child_at(0)); - GURL urn_uuid = GURL("urn:uuid:123456789"); + GURL urn_uuid = GURL("urn:uuid:12345678-9abc-def0-1234-56789abcdef0"); EXPECT_TRUE(urn_uuid.is_valid()); std::string navigate_urn_script = JsReplace("f.src = $1;", urn_uuid.spec()); @@ -1971,7 +1971,7 @@ IN_PROC_BROWSER_TEST_P(UUIDFrameTreeBrowserTest, EXPECT_TRUE(NavigateIframeAndCheckURL(web_contents(), "test_iframe", initial_frame_url, initial_frame_url)); - GURL urn_uuid("urn:uuid:C36973B5E5D9DE59E4C4364F137B3C7A"); + GURL urn_uuid("urn:uuid:c36973b5-e5d9-de59-e4c4-364f137b3c7a"); // We expect iframe navigations to invalid URNs to fail, regardless of if the // feature is enabled. diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityNodeInfoUtils.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityNodeInfoUtils.java index 901641879b93b4..93a54dc118fc7f 100644 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityNodeInfoUtils.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityNodeInfoUtils.java @@ -42,18 +42,14 @@ public static String toString(AccessibilityNodeInfo node) { builder.append(classNameParts[classNameParts.length - 1]); // Print text unless it is empty (null is allowed). - if (node.getText() == null) { - builder.append(" text:\"null\""); - } else if (!node.getText().toString().isEmpty()) { - builder.append(" text:\"") - .append(node.getText().toString().replace("\n", "\\n")) - .append("\""); + if (node.getText() == null || !node.getText().toString().isEmpty()) { + builder.append(" text:\"").append(node.getText()).append("\""); } // Text properties - Only print when non-null. if (node.getContentDescription() != null) { builder.append(" contentDescription:\"") - .append(node.getContentDescription().toString().replace("\n", "\\n")) + .append(node.getContentDescription()) .append("\""); } if (node.getViewIdResourceName() != null) { diff --git a/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTreeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTreeTest.java index 3d36daed036a34..0d02553da36b28 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTreeTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTreeTest.java @@ -157,36 +157,6 @@ public void test_annotationRoles() { // ------------------ HTML TESTS ------------------ // - @Test - @SmallTest - public void test_aNameCalc() { - performHtmlTest("a-name-calc.html"); - } - - @Test - @SmallTest - public void test_aName() { - performHtmlTest("a-name.html"); - } - - @Test - @SmallTest - public void test_aNestedStructure() { - performHtmlTest("a-nested-structure.html"); - } - - @Test - @SmallTest - public void test_aNoText() { - performHtmlTest("a-no-text.html"); - } - - @Test - @SmallTest - public void test_aWithImg() { - performHtmlTest("a-with-img.html"); - } - @Test @SmallTest public void test_a() { @@ -195,146 +165,50 @@ public void test_a() { @Test @SmallTest - public void test_abbr() { - performHtmlTest("abbr.html"); - } - - @Test - @SmallTest - public void test_accordion() { - performHtmlTest("accordion.html"); - } - - @Test - @SmallTest - public void test_actionVerbs() { - performHtmlTest("action-verbs.html"); - } - - @Test - @SmallTest - public void test_actions() { - performHtmlTest("actions.html"); - } - - @Test - @SmallTest - public void test_address() { - performHtmlTest("address.html"); - } - - @Test - @SmallTest - public void test_area() { - performHtmlTest("area.html"); - } - - @Test - @SmallTest - public void test_article() { - performHtmlTest("article.html"); - } - - @Test - @SmallTest - public void test_aside() { - performHtmlTest("aside.html"); - } - - @Test - @SmallTest - public void test_b() { - performHtmlTest("b.html"); - } - - @Test - @SmallTest - public void test_bdo() { - performHtmlTest("bdo.html"); - } - - @Test - @SmallTest - public void test_blockquoteLevels() { - performHtmlTest("blockquote-levels.html"); - } - - @Test - @SmallTest - public void test_blockquote() { - performHtmlTest("blockquote.html"); - } - - @Test - @SmallTest - public void test_body() { - performHtmlTest("body.html"); - } - - @Test - @SmallTest - public void test_br() { - performHtmlTest("br.html"); - } - - @Test - @SmallTest - public void test_buttonNameCalc() { - performHtmlTest("button-name-calc.html"); - } - - @Test - @SmallTest - public void test_buttonWithListboxPopup() { - performHtmlTest("button-with-listbox-popup.html"); - } - - @Test - @SmallTest - public void test_button() { - performHtmlTest("button.html"); + public void test_aName() { + performHtmlTest("a-name.html"); } @Test @SmallTest - public void test_canvasFallback() { - performHtmlTest("canvas-fallback.html"); + public void test_aNameCalc() { + performHtmlTest("a-name-calc.html"); } @Test @SmallTest - public void test_canvas() { - performHtmlTest("canvas.html"); + public void test_aNestedStructure() { + performHtmlTest("a-nested-structure.html"); } @Test @SmallTest - public void test_caption() { - performHtmlTest("caption.html"); + public void test_aNoText() { + performHtmlTest("a-no-text.html"); } @Test @SmallTest - public void test_characterLocations() { - performHtmlTest("character-locations.html"); + public void test_aOnclick() { + performHtmlTest("a-onclick.html"); } @Test @SmallTest - public void test_checkboxNameCalc() { - performHtmlTest("checkbox-name-calc.html"); + public void test_aWithBefore() { + performHtmlTest("a-with-before.html"); } @Test @SmallTest - public void test_cite() { - performHtmlTest("cite.html"); + public void test_aWithImg() { + performHtmlTest("a-with-img.html"); } @Test @SmallTest - public void test_clickableAncestor() { - performHtmlTest("clickable-ancestor.html"); + public void test_tableSimple() { + performHtmlTest("table-simple.html"); } @Test @@ -342,1006 +216,4 @@ public void test_clickableAncestor() { public void test_clickableScore() { performHtmlTest("clickable-score.html"); } - - @Test - @SmallTest - public void test_code() { - performHtmlTest("code.html"); - } - - @Test - @SmallTest - public void test_col() { - performHtmlTest("col.html"); - } - - @Test - @SmallTest - public void test_colgroup() { - performHtmlTest("colgroup.html"); - } - - @Test - @SmallTest - public void test_comboboxOptgroup() { - performHtmlTest("combobox-optgroup.html"); - } - - @Test - @SmallTest - public void test_contenteditableDescendants() { - performHtmlTest("contenteditable-descendants.html"); - } - - @Test - @SmallTest - public void test_contenteditableWithEmbeddedContenteditables() { - performHtmlTest("contenteditable-with-embedded-contenteditables.html"); - } - - @Test - @SmallTest - public void test_contenteditableWithNoDescendants() { - performHtmlTest("contenteditable-with-no-descendants.html"); - } - - @Test - @SmallTest - public void test_continuations() { - performHtmlTest("continuations.html"); - } - - @Test - @SmallTest - public void test_dd() { - performHtmlTest("dd.html"); - } - - @Test - @SmallTest - public void test_del() { - performHtmlTest("del.html"); - } - - @Test - @SmallTest - public void test_details() { - performHtmlTest("details.html"); - } - - @Test - @SmallTest - public void test_dfn() { - performHtmlTest("dfn.html"); - } - - @Test - @SmallTest - public void test_dialog() { - performHtmlTest("dialog.html"); - } - - @Test - @SmallTest - public void test_disabled() { - performHtmlTest("disabled.html"); - } - - @Test - @SmallTest - public void test_div() { - performHtmlTest("div.html"); - } - - @Test - @SmallTest - public void test_dl() { - performHtmlTest("dl.html"); - } - - @Test - @SmallTest - public void test_dt() { - performHtmlTest("dt.html"); - } - - @Test - @SmallTest - public void test_elementClassIdSrcAttr() { - performHtmlTest("element-class-id-src-attr.html"); - } - - @Test - @SmallTest - public void test_em() { - performHtmlTest("em.html"); - } - - @Test - @SmallTest - public void test_embed() { - performHtmlTest("embed.html"); - } - - @Test - @SmallTest - public void test_fieldset() { - performHtmlTest("fieldset.html"); - } - - @Test - @SmallTest - public void test_figcaption() { - performHtmlTest("figcaption.html"); - } - - @Test - @SmallTest - public void test_figure() { - performHtmlTest("figure.html"); - } - - @Test - @SmallTest - public void test_fixedWidthText() { - performHtmlTest("fixed-width-text.html"); - } - - @Test - @SmallTest - public void test_footerInsideOtherSection() { - performHtmlTest("footer-inside-other-section.html"); - } - - @Test - @SmallTest - public void test_footer() { - performHtmlTest("footer.html"); - } - - @Test - @SmallTest - public void test_form() { - performHtmlTest("form.html"); - } - - @Test - @SmallTest - public void test_frameset() { - performHtmlTest("frameset.html"); - } - - @Test - @SmallTest - public void test_headerInsideOtherSection() { - performHtmlTest("header-inside-other-section.html"); - } - - @Test - @SmallTest - public void test_header() { - performHtmlTest("header.html"); - } - - @Test - @SmallTest - public void test_headingWithTabindex() { - performHtmlTest("heading-with-tabIndex.html"); - } - - @Test - @SmallTest - public void test_heading() { - performHtmlTest("heading.html"); - } - - @Test - @SmallTest - public void test_hr() { - performHtmlTest("hr.html"); - } - - @Test - @SmallTest - public void test_html() { - performHtmlTest("html.html"); - } - - @Test - @SmallTest - public void test_i() { - performHtmlTest("i.html"); - } - - @Test - @SmallTest - public void test_id() { - performHtmlTest("id.html"); - } - - @Test - @SmallTest - public void test_iframeAriaHidden() { - performHtmlTest("iframe-aria-hidden.html"); - } - - @Test - @SmallTest - public void test_iframeCoordinatesCrossProcess() { - performHtmlTest("iframe-coordinates-cross-process.html"); - } - - @Test - @SmallTest - public void test_iframeCrossProcess() { - performHtmlTest("iframe-cross-process.html"); - } - - @Test - @SmallTest - public void test_iframeEmptyPositioned() { - performHtmlTest("iframe-empty-positioned.html"); - } - - @Test - @SmallTest - public void test_iframeFocus() { - performHtmlTest("iframe-focus.html"); - } - - @Test - @SmallTest - public void test_iframePresentational() { - performHtmlTest("iframe-presentational.html"); - } - - @Test - @SmallTest - public void test_iframeTransform() { - performHtmlTest("iframe-transform.html"); - } - - @Test - @SmallTest - public void test_iframeTraversal() { - performHtmlTest("iframe-traversal.html"); - } - - @Test - @SmallTest - public void test_iframe() { - performHtmlTest("iframe.html"); - } - - @Test - @SmallTest - public void test_imgEmptyAlt() { - performHtmlTest("img-empty-alt.html"); - } - - @Test - @SmallTest - public void test_imgLinkEmptyAlt() { - performHtmlTest("img-link-empty-alt.html"); - } - - @Test - @SmallTest - public void test_img() { - performHtmlTest("img.html"); - } - - @Test - @SmallTest - public void test_inPageLinks() { - performHtmlTest("in-page-links.html"); - } - - @Test - @SmallTest - public void test_inputButton() { - performHtmlTest("input-button.html"); - } - - @Test - @SmallTest - public void test_inputCheckboxLabel() { - performHtmlTest("input-checkbox-label.html"); - } - - @Test - @SmallTest - public void test_inputColorWithPopupOpen() { - performHtmlTest("input-color-with-popup-open.html"); - } - - @Test - @SmallTest - public void test_inputColor() { - performHtmlTest("input-color.html"); - } - - @Test - @SmallTest - public void test_inputDateWithPopupOpenMultipleForWin() { - performHtmlTest("input-date-with-popup-open-multiple-for-win.html"); - } - - @Test - @SmallTest - public void test_inputDateWithPopupOpenMultiple() { - performHtmlTest("input-date-with-popup-open-multiple.html"); - } - - @Test - @SmallTest - public void test_inputDateWithPopupOpen() { - performHtmlTest("input-date-with-popup-open.html"); - } - - @Test - @SmallTest - public void test_inputDate() { - performHtmlTest("input-date.html"); - } - - @Test - @SmallTest - public void test_inputDatetimeLocal() { - performHtmlTest("input-datetime-local.html"); - } - - @Test - @SmallTest - public void test_inputDatetime() { - performHtmlTest("input-datetime.html"); - } - - @Test - @SmallTest - public void test_inputEmail() { - performHtmlTest("input-email.html"); - } - - @Test - @SmallTest - public void test_inputFile() { - performHtmlTest("input-file.html"); - } - - @Test - @SmallTest - public void test_inputImage() { - performHtmlTest("input-image.html"); - } - - @Test - @SmallTest - public void test_inputList() { - performHtmlTest("input-list.html"); - } - - @Test - @SmallTest - public void test_inputMonth() { - performHtmlTest("input-month.html"); - } - - @Test - @SmallTest - public void test_inputNumber() { - performHtmlTest("input-number.html"); - } - - @Test - @SmallTest - public void test_inputRadioCheckboxLabel() { - performHtmlTest("input-radio-checkbox-label.html"); - } - - @Test - @SmallTest - public void test_inputRadioInMenu() { - performHtmlTest("input-radio-in-menu.html"); - } - - @Test - @SmallTest - public void test_inputRadio() { - performHtmlTest("input-radio.html"); - } - - @Test - @SmallTest - public void test_inputRange() { - performHtmlTest("input-range.html"); - } - - @Test - @SmallTest - public void test_inputReset() { - performHtmlTest("input-reset.html"); - } - - @Test - @SmallTest - public void test_inputSearch() { - performHtmlTest("input-search.html"); - } - - @Test - @SmallTest - public void test_inputSubmit() { - performHtmlTest("input-submit.html"); - } - - @Test - @SmallTest - public void test_inputSuggestionsSourceElement() { - performHtmlTest("input-suggestions-source-element.html"); - } - - @Test - @SmallTest - public void test_inputTel() { - performHtmlTest("input-tel.html"); - } - - @Test - @SmallTest - public void test_inputTextNameCalc() { - performHtmlTest("input-text-name-calc.html"); - } - - @Test - @SmallTest - public void test_inputTextReadOnly() { - performHtmlTest("input-text-read-only.html"); - } - - @Test - @SmallTest - public void test_inputTextValue() { - performHtmlTest("input-text-value.html"); - } - - @Test - @SmallTest - public void test_inputText() { - performHtmlTest("input-text.html"); - } - - @Test - @SmallTest - public void test_inputTimeWithPopupOpen() { - performHtmlTest("input-time-with-popup-open.html"); - } - - @Test - @SmallTest - public void test_inputTime() { - performHtmlTest("input-time.html"); - } - - @Test - @SmallTest - public void test_inputUrl() { - performHtmlTest("input-url.html"); - } - - @Test - @SmallTest - public void test_inputWeek() { - performHtmlTest("input-week.html"); - } - - @Test - @SmallTest - public void test_ins() { - performHtmlTest("ins.html"); - } - - @Test - @SmallTest - public void test_isInteresting() { - performHtmlTest("isInteresting.html"); - } - - @Test - @SmallTest - public void test_label() { - performHtmlTest("label.html"); - } - - @Test - @SmallTest - public void test_landmark() { - performHtmlTest("landmark.html"); - } - - @Test - @SmallTest - public void test_legend() { - performHtmlTest("legend.html"); - } - - @Test - @SmallTest - public void test_li() { - performHtmlTest("li.html"); - } - - @Test - @SmallTest - public void test_linkInsideHeading() { - performHtmlTest("link-inside-heading.html"); - } - - @Test - @SmallTest - public void test_listItemAriaSetsizeUnknownFlattened() { - performHtmlTest("list-item-aria-setsize-unknown-flattened.html"); - } - - @Test - @SmallTest - public void test_listItemAriaSetsizeUnknown() { - performHtmlTest("list-item-aria-setsize-unknown.html"); - } - - @Test - @SmallTest - public void test_listMarkers() { - performHtmlTest("list-markers.html"); - } - - @Test - @SmallTest - public void test_list() { - performHtmlTest("list.html"); - } - - @Test - @SmallTest - public void test_main() { - performHtmlTest("main.html"); - } - - @Test - @SmallTest - public void test_mapAnyContents() { - performHtmlTest("map-any-contents.html"); - } - - @Test - @SmallTest - public void test_mark() { - performHtmlTest("mark.html"); - } - - @Test - @SmallTest - public void test_math() { - performHtmlTest("math.html"); - } - - @Test - @SmallTest - public void test_menu() { - performHtmlTest("menu.html"); - } - - @Test - @SmallTest - public void test_meter() { - performHtmlTest("meter.html"); - } - - @Test - @SmallTest - public void test_navigation() { - performHtmlTest("navigation.html"); - } - - @Test - @SmallTest - public void test_nestedlist() { - performHtmlTest("nestedlist.html"); - } - - @Test - @SmallTest - public void test_object() { - performHtmlTest("object.html"); - } - - @Test - @SmallTest - public void test_offscreenIframeContent() { - performHtmlTest("offscreen-iframe-content.html"); - } - - @Test - @SmallTest - public void test_offscreenIframe() { - performHtmlTest("offscreen-iframe.html"); - } - - @Test - @SmallTest - public void test_offscreenSelect() { - performHtmlTest("offscreen-select.html"); - } - - @Test - @SmallTest - public void test_ol() { - performHtmlTest("ol.html"); - } - - @Test - @SmallTest - public void test_optgroup() { - performHtmlTest("optgroup.html"); - } - - @Test - @SmallTest - public void test_output() { - performHtmlTest("output.html"); - } - - @Test - @SmallTest - public void test_overflowActions() { - performHtmlTest("overflow-actions.html"); - } - - @Test - @SmallTest - public void test_p() { - performHtmlTest("p.html"); - } - - @Test - @SmallTest - public void test_param() { - performHtmlTest("param.html"); - } - - @Test - @SmallTest - public void test_picture() { - performHtmlTest("picture.html"); - } - - @Test - @SmallTest - public void test_portalWithWidgetInside() { - performHtmlTest("portal-with-widget-inside.html"); - } - - @Test - @SmallTest - public void test_portal() { - performHtmlTest("portal.html"); - } - - @Test - @SmallTest - public void test_pre() { - performHtmlTest("pre.html"); - } - - @Test - @SmallTest - public void test_progress() { - performHtmlTest("progress.html"); - } - - @Test - @SmallTest - public void test_q() { - performHtmlTest("q.html"); - } - - @Test - @SmallTest - public void test_replacedNodeAcrossTrees() { - performHtmlTest("replaced-node-across-trees.html"); - } - - @Test - @SmallTest - public void test_ruby() { - performHtmlTest("ruby.html"); - } - - @Test - @SmallTest - public void test_s() { - performHtmlTest("s.html"); - } - - @Test - @SmallTest - public void test_samp() { - performHtmlTest("samp.html"); - } - - @Test - @SmallTest - public void test_scrollableOverflow() { - performHtmlTest("scrollable-overflow.html"); - } - - @Test - @SmallTest - public void test_scrollableTextarea() { - performHtmlTest("scrollable-textarea.html"); - } - - @Test - @SmallTest - public void test_scrollable() { - performHtmlTest("scrollable.html"); - } - - @Test - @SmallTest - public void test_section() { - performHtmlTest("section.html"); - } - - @Test - @SmallTest - public void test_select() { - performHtmlTest("select.html"); - } - - @Test - @SmallTest - public void test_selectionContainer() { - performHtmlTest("selection-container.html"); - } - - @Test - @SmallTest - public void test_selectmenu() { - performHtmlTest("selectmenu.html"); - } - - @Test - @SmallTest - public void test_simple_spans() { - performHtmlTest("simple_spans.html"); - } - - @Test - @SmallTest - public void test_small() { - performHtmlTest("small.html"); - } - - @Test - @SmallTest - public void test_span() { - performHtmlTest("span.html"); - } - - @Test - @SmallTest - public void test_spansSeparatedBySpace() { - performHtmlTest("spans-separated-by-space.html"); - } - - @Test - @SmallTest - public void test_strong() { - performHtmlTest("strong.html"); - } - - @Test - @SmallTest - public void test_sub() { - performHtmlTest("sub.html"); - } - - @Test - @SmallTest - public void test_summary() { - performHtmlTest("summary.html"); - } - - @Test - @SmallTest - public void test_sup() { - performHtmlTest("sup.html"); - } - - @Test - @SmallTest - public void test_svgAsObjectSource() { - performHtmlTest("svg-as-object-source.html"); - } - - @Test - @SmallTest - public void test_svgChildOfButton() { - performHtmlTest("svg-child-of-button.html"); - } - - @Test - @SmallTest - public void test_svgChildOfSvg() { - performHtmlTest("svg-child-of-svg.html"); - } - - @Test - @SmallTest - public void test_svgDescInGroup() { - performHtmlTest("svg-desc-in-group.html"); - } - - @Test - @SmallTest - public void test_svgStyleElement() { - performHtmlTest("svg-style-element.html"); - } - - @Test - @SmallTest - public void test_svgSymbolWithRole() { - performHtmlTest("svg-symbol-with-role.html"); - } - - @Test - @SmallTest - public void test_svgTextAlternativeComputation() { - performHtmlTest("svg-text-alternative-computation.html"); - } - - @Test - @SmallTest - public void test_svgWithClickableRect() { - performHtmlTest("svg-with-clickable-rect.html"); - } - - @Test - @SmallTest - public void test_svgWithForeignObject() { - performHtmlTest("svg-with-foreign-object.html"); - } - - @Test - @SmallTest - public void test_svgWithLinkToDocument() { - performHtmlTest("svg-with-link-to-document.html"); - } - - @Test - @SmallTest - public void test_svgWithNonLinkAnchors() { - performHtmlTest("svg-with-non-link-anchors.html"); - } - - @Test - @SmallTest - public void test_svg() { - performHtmlTest("svg.html"); - } - - @Test - @SmallTest - public void test_tabindexExposeChildren() { - performHtmlTest("tabindex-expose-children.html"); - } - - @Test - @SmallTest - public void test_tableFocusableSections() { - performHtmlTest("table-focusable-sections.html"); - } - - @Test - @SmallTest - public void test_tableLayout() { - performHtmlTest("table-layout.html"); - } - - @Test - @SmallTest - public void test_tablePresentation() { - performHtmlTest("table-presentation.html"); - } - - @Test - @SmallTest - public void test_tableSimple2() { - performHtmlTest("table-simple-2.html"); - } - - @Test - @SmallTest - public void test_tableSimple() { - performHtmlTest("table-simple.html"); - } - - @Test - @SmallTest - public void test_tableSpans() { - performHtmlTest("table-spans.html"); - } - - @Test - @SmallTest - public void test_tableThColheader() { - performHtmlTest("table-th-colheader.html"); - } - - @Test - @SmallTest - public void test_tableThRowheader() { - performHtmlTest("table-th-rowheader.html"); - } - - @Test - @SmallTest - public void test_tableTheadTbodyTfoot() { - performHtmlTest("table-thead-tbody-tfoot.html"); - } - - @Test - @SmallTest - public void test_textAlign() { - performHtmlTest("text-align.html"); - } - - @Test - @SmallTest - public void test_textIndent() { - performHtmlTest("text-indent.html"); - } - - @Test - @SmallTest - public void test_textareaReadOnly() { - performHtmlTest("textarea-read-only.html"); - } - - @Test - @SmallTest - public void test_textarea() { - performHtmlTest("textarea.html"); - } - - @Test - @SmallTest - public void test_time() { - performHtmlTest("time.html"); - } - - @Test - @SmallTest - public void test_ulContenteditable() { - performHtmlTest("ul-contenteditable.html"); - } - - @Test - @SmallTest - public void test_ul() { - performHtmlTest("ul.html"); - } - - @Test - @SmallTest - public void test_var() { - performHtmlTest("var.html"); - } - - @Test - @SmallTest - public void test_wbr() { - performHtmlTest("wbr.html"); - } } \ No newline at end of file diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc index 89d82cb6480400..8e33e6b5d48d18 100644 --- a/content/public/common/content_switch_dependent_feature_overrides.cc +++ b/content/public/common/content_switch_dependent_feature_overrides.cc @@ -133,6 +133,12 @@ GetSwitchDependentFeatureOverrides(const base::CommandLine& command_line) { {switches::kForceMajorVersionTo100, std::cref(blink::features::kForceMajorVersion100InUserAgent), base::FeatureList::OVERRIDE_ENABLE_FEATURE}, + + // Override for --force-minor-version-to-100. + {switches::kForceMinorVersionTo100, + std::cref(blink::features::kForceMinorVersion100InUserAgent), + base::FeatureList::OVERRIDE_ENABLE_FEATURE}, + }; std::vector overrides; diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index c53b6e1ff18e2b..7e79aca5e139f3 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -493,6 +493,9 @@ const char kEnableOopRasterization[] = "enable-oop-rasterization"; // Forces the Chrome major version to 100 in the User-Agent string. const char kForceMajorVersionTo100[] = "force-major-version-to-100"; +// Forces the Chrome minor version to 100 in the User-Agent string. +const char kForceMinorVersionTo100[] = "force-minor-version-to-100"; + // Forces use of hardware overlay for fullscreen video playback. Useful for // testing the Android overlay fullscreen functionality on other platforms. const char kForceOverlayFullscreenVideo[] = "force-overlay-fullscreen-video"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index b26a40b8b7d60f..9d1beef1f37bab 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -143,6 +143,7 @@ CONTENT_EXPORT extern const char kForceDisplayList2dCanvas[]; CONTENT_EXPORT extern const char kDisableOopRasterization[]; CONTENT_EXPORT extern const char kEnableOopRasterization[]; CONTENT_EXPORT extern const char kForceMajorVersionTo100[]; +CONTENT_EXPORT extern const char kForceMinorVersionTo100[]; CONTENT_EXPORT extern const char kForceOverlayFullscreenVideo[]; CONTENT_EXPORT extern const char kForcePresentationReceiverForTesting[]; CONTENT_EXPORT extern const char kForceRendererAccessibility[]; diff --git a/content/test/data/accessibility/html/a-onclick-expected-android-external.txt b/content/test/data/accessibility/html/a-onclick-expected-android-external.txt new file mode 100644 index 00000000000000..995f0ebe424e06 --- /dev/null +++ b/content/test/data/accessibility/html/a-onclick-expected-android-external.txt @@ -0,0 +1,5 @@ +WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] +++View text:"null" contentDescription:"link with no href but onclick" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link"] +++++TextView text:"link with no href but onclick" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++View text:"null" contentDescription:"link with no href and click handler added via script" viewIdResName:"add-click-handler-to-me" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link"] +++++TextView text:"link with no href and click handler added via script" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/a-with-before-expected-android-external.txt b/content/test/data/accessibility/html/a-with-before-expected-android-external.txt new file mode 100644 index 00000000000000..8b95135f1c3d96 --- /dev/null +++ b/content/test/data/accessibility/html/a-with-before-expected-android-external.txt @@ -0,0 +1,7 @@ +WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] +++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] +++++TextView text:"Here is a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++View text:"null" contentDescription:"[linked] link" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="http://google.com/"] +++++++TextView text:"[linked] " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++++TextView text:"link" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] +++++TextView text:"." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/abbr-expected-android-external.txt b/content/test/data/accessibility/html/abbr-expected-android-external.txt deleted file mode 100644 index 3b1b0f6abb4b45..00000000000000 --- a/content/test/data/accessibility/html/abbr-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"The " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"World Health Organization" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="abbr"] -++++TextView text:" was founded in 1948." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/accordion-expected-android-external.txt b/content/test/data/accessibility/html/accordion-expected-android-external.txt deleted file mode 100644 index 7dcb49a4c5a231..00000000000000 --- a/content/test/data/accessibility/html/accordion-expected-android-external.txt +++ /dev/null @@ -1,13 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Accordion Section #1" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++++Button text:"Accordion Section #1" viewIdResName:"header1control" clickable focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COLLAPSE] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View text:"Accordion Section #1" viewIdResName:"section1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="region", roleDescription="region"] -++++TextView text:"Content for first section of accordion element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View text:"Accordion Section #2" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++++Button text:"Accordion Section #2" viewIdResName:"header2control" clickable focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View text:"Accordion Section #3" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++++Button text:"Accordion Section #3" viewIdResName:"header3control" clickable focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View text:"Accordion Section #4" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++++Button text:"Accordion Section #4" viewIdResName:"header4control" clickable disabled focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COLLAPSE] bundle:[chromeRole="button", roleDescription="button"] -++View text:"Accordion Section #4" viewIdResName:"section3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="region", roleDescription="region"] -++++TextView text:"Content for forth section of accordion element. This section will always be visible but disabled." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/action-verbs-expected-android-external.txt b/content/test/data/accessibility/html/action-verbs-expected-android-external.txt deleted file mode 100644 index 3721123f1d42c9..00000000000000 --- a/content/test/data/accessibility/html/action-verbs-expected-android-external.txt +++ /dev/null @@ -1,32 +0,0 @@ -WebView text:"Action verbs" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Generic div" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Heading" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View text:"null" contentDescription:"Link" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/action-verbs.html#"] -++++TextView text:"Link" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="searchBox", clickableScore="300", roleDescription="search text field"] -++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++CheckBox checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++CheckBox checkable checked clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++RadioButton checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++ToggleButton text:"ARIA Switch" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="switch", clickableScore="300", roleDescription="switch"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"Summary" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View text:"Pop-up button" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++TextView text:"Div with click handler" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", clickableScore="200"] -++View clickable actions:[CLICK, AX_FOCUS] bundle:[chromeRole="group", clickableScore="200"] -++++TextView text:"Paragraph with click handler on parent" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", clickableScore="100"] -++View actions:[AX_FOCUS] bundle:[chromeRole="menu", roleDescription="menu"] -++++MenuItem text:"Menu item 1" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuItem", clickableScore="300", roleDescription="menu item"] -++++MenuItem text:"Menu item 2" checkable checked clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuItemCheckBox", clickableScore="300", roleDescription="checkbox"] -++++MenuItem text:"Menu item 3" checkable clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuItemRadio", clickableScore="300", roleDescription="radio button"] -++Button text:"ARIA Button" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"ARIA button with tab index" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"ARIA button with negative tab index" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View clickable actions:[CLICK, AX_FOCUS] bundle:[chromeRole="genericContainer", clickableScore="200"] -++++Button text:"ARIA button that is an active descendant" viewIdResName:"active-descendant-button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View clickable actions:[CLICK, AX_FOCUS] bundle:[chromeRole="genericContainer", clickableScore="200"] -++++ToggleButton text:"ARIA switch in clickable container" checkable clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="switch", clickableScore="300", roleDescription="switch"] -++++TextView text:"Generic in clickable container" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", clickableScore="100"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/actions-expected-android-external.txt b/content/test/data/accessibility/html/actions-expected-android-external.txt deleted file mode 100644 index 29779fbab213e1..00000000000000 --- a/content/test/data/accessibility/html/actions-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView text:"Actions" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++SeekBar text:"50" clickable focusable RangeInfo:[current=50.0, min=1.0, max=100.0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Test textfield"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/address-expected-android-external.txt b/content/test/data/accessibility/html/address-expected-android-external.txt deleted file mode 100644 index a8bd99c42d2957..00000000000000 --- a/content/test/data/accessibility/html/address-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Please contact John Citizen for more information." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/area-expected-android-external.txt b/content/test/data/accessibility/html/area-expected-android-external.txt deleted file mode 100644 index 3f9876146dd201..00000000000000 --- a/content/test/data/accessibility/html/area-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++++++View text:"null" contentDescription:"pipe1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/fake.htm"] -++++++TextView text:"pipe2" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText", clickableScore="200"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/article-expected-android-external.txt b/content/test/data/accessibility/html/article-expected-android-external.txt deleted file mode 100644 index 3a8b91d0bafee2..00000000000000 --- a/content/test/data/accessibility/html/article-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"This is an article element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="article", roleDescription="article"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/aside-expected-android-external.txt b/content/test/data/accessibility/html/aside-expected-android-external.txt deleted file mode 100644 index 2590c5e5900569..00000000000000 --- a/content/test/data/accessibility/html/aside-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"The aside tag defines some content aside from the content it is placed in." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++++TextView text:"Aside tag" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 4"] -++++TextView text:"The aside content should be related to the surrounding content." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/b-expected-android-external.txt b/content/test/data/accessibility/html/b-expected-android-external.txt deleted file mode 100644 index 2734761b2895ff..00000000000000 --- a/content/test/data/accessibility/html/b-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Some bold text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/bdo-expected-android-external.txt b/content/test/data/accessibility/html/bdo-expected-android-external.txt deleted file mode 100644 index 66303d3f4b9eed..00000000000000 --- a/content/test/data/accessibility/html/bdo-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Some LTR text Some RTL text with some LTR text embedded" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/blockquote-expected-android-external.txt b/content/test/data/accessibility/html/blockquote-expected-android-external.txt deleted file mode 100644 index fe42e5b695866a..00000000000000 --- a/content/test/data/accessibility/html/blockquote-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++TextView text:"First blockquote has a child element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View text:"Second blockquote has no child." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/blockquote-levels-expected-android-external.txt b/content/test/data/accessibility/html/blockquote-levels-expected-android-external.txt deleted file mode 100644 index 013530e7aeaffa..00000000000000 --- a/content/test/data/accessibility/html/blockquote-levels-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++TextView text:"Top level" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++++TextView text:"Sub" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++View text:"Sub-sub" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/body-expected-android-external.txt b/content/test/data/accessibility/html/body-expected-android-external.txt deleted file mode 100644 index 2cdd1a3a3171b1..00000000000000 --- a/content/test/data/accessibility/html/body-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This test is for body tag" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/br-expected-android-external.txt b/content/test/data/accessibility/html/br-expected-android-external.txt deleted file mode 100644 index b13208d537c781..00000000000000 --- a/content/test/data/accessibility/html/br-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"\n" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="lineBreak", offscreen="true"] -++TextView text:"Text line 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:"Text line 2\nText line 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View text:"\n" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="lineBreak", offscreen="true"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/button-expected-android-external.txt b/content/test/data/accessibility/html/button-expected-android-external.txt deleted file mode 100644 index 89d96e40a7717e..00000000000000 --- a/content/test/data/accessibility/html/button-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Click me!" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/button-name-calc-expected-android-external.txt b/content/test/data/accessibility/html/button-name-calc-expected-android-external.txt deleted file mode 100644 index 9981138fc4f0cc..00000000000000 --- a/content/test/data/accessibility/html/button-name-calc-expected-android-external.txt +++ /dev/null @@ -1,18 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++Button text:"InnerText0" viewIdResName:"c0" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"InnerText1" viewIdResName:"c1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="Title1", roleDescription="button"] -++Button text:"AriaLabel2" viewIdResName:"c2" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="Title2", roleDescription="button"] -++Button text:"LabelledBy3" viewIdResName:"c3" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="Title3", roleDescription="button"] -++Button text:"LabelledBy4" viewIdResName:"c4" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="DescribedBy4", roleDescription="button"] -++Button text:"InnerText5" viewIdResName:"c5" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="DescribedBy5", roleDescription="button"] -++Button text:"Outer inner" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"Outer inner1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"Outer grandchild" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"LabelledBy3" viewIdResName:"lb3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"LabelledBy4" viewIdResName:"lb4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy4" viewIdResName:"db4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy5" viewIdResName:"db5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/button-with-listbox-popup-expected-android-external.txt b/content/test/data/accessibility/html/button-with-listbox-popup-expected-android-external.txt deleted file mode 100644 index 7dbf46b5e57864..00000000000000 --- a/content/test/data/accessibility/html/button-with-listbox-popup-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View viewIdResName:"test1" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"Choose one:" viewIdResName:"span" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++View text:"Choose one: Foo" viewIdResName:"test" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="pop up button"] -++++ListView text:"Choose one:, 3 items" viewIdResName:"options" clickable focusable CollectionInfo:[rows=3, cols=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBox", clickableScore="300", roleDescription="list box"] -++++++View text:"Baz, in list, item 1 of 3" viewIdResName:"option1" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Bar, in list, item 2 of 3" viewIdResName:"option2" clickable focusable CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Foo, in list, item 3 of 3" viewIdResName:"option3" clickable focusable CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/canvas-expected-android-external.txt b/content/test/data/accessibility/html/canvas-expected-android-external.txt deleted file mode 100644 index 711a5df8b83102..00000000000000 --- a/content/test/data/accessibility/html/canvas-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"Static fallback" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="canvas", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="canvas", hasImage="true"] -++++++View text:"null" contentDescription:"Interactive fallback" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/canvas.html#"] -++++++++TextView text:"Interactive fallback" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/canvas-fallback-expected-android-external.txt b/content/test/data/accessibility/html/canvas-fallback-expected-android-external.txt deleted file mode 100644 index 019b0e83bfbf79..00000000000000 --- a/content/test/data/accessibility/html/canvas-fallback-expected-android-external.txt +++ /dev/null @@ -1,15 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"Static fallback" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="canvas", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="canvas", hasImage="true"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"Line breaking content in a fallback" viewIdResName:"p1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", hint="Aria hidden paragraph in fallback content"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"This is another paragraph in fallback" viewIdResName:"p2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", hint="Visibility hidden paragraph in fallback content"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"Aria hidden paragraph in fallback content" viewIdResName:"h1" notVisibleToUser CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"Display none text in fallback content " notVisibleToUser CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"Visibility hidden paragraph in fallback content" viewIdResName:"h2" notVisibleToUser CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 2"] -++++++TextView text:"\n " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/caption-expected-android-external.txt b/content/test/data/accessibility/html/caption-expected-android-external.txt deleted file mode 100644 index d4f7401586f932..00000000000000 --- a/content/test/data/accessibility/html/caption-expected-android-external.txt +++ /dev/null @@ -1,17 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++GridView text:"Browser and Engine" CollectionInfo:[rows=3, cols=2] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="table", roleDescription="table"] -++++View text:"Browser and Engine" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="caption"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Browser" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++View text:"Engine" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Chrome" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"Blink" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Safari" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"WebKit" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++GridView text:"Name" CollectionInfo:[rows=1, cols=2] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="table", hint="Description", roleDescription="table"] -++++View text:"Description" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="caption"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"A" CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"B" CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/character-locations-expected-android-external.txt b/content/test/data/accessibility/html/character-locations-expected-android-external.txt deleted file mode 100644 index 3688f0117cffa1..00000000000000 --- a/content/test/data/accessibility/html/character-locations-expected-android-external.txt +++ /dev/null @@ -1,9 +0,0 @@ -WebView text:"Character Locations" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++TextView text:"Heading" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++TextView text:"Paragraph" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++EditText text:"Input" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++EditText text:"Textarea" clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++Image text:"Image with alt text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic"] -++View text:"null" contentDescription:"Image inside link" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hasImage="true", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/character-locations.html#"] -++++Image text:"Image inside link" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", clickableScore="100", hasImage="true", roleDescription="graphic"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/checkbox-name-calc-expected-android-external.txt b/content/test/data/accessibility/html/checkbox-name-calc-expected-android-external.txt deleted file mode 100644 index da6b79bdca4d26..00000000000000 --- a/content/test/data/accessibility/html/checkbox-name-calc-expected-android-external.txt +++ /dev/null @@ -1,22 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++CheckBox text:"Title0" viewIdResName:"c0" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++CheckBox text:"Label1" viewIdResName:"c1" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", hint="Title1", roleDescription="checkbox"] -++CheckBox text:"AriaLabel2" viewIdResName:"c2" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", hint="Title2", roleDescription="checkbox"] -++CheckBox text:"LabelledBy3" viewIdResName:"c3" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", hint="Title3", roleDescription="checkbox"] -++CheckBox text:"LabelledBy4" viewIdResName:"c4" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", hint="DescribedBy4", roleDescription="checkbox"] -++CheckBox viewIdResName:"c5" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="checkBox", clickableScore="300", hint="DescribedBy5", roleDescription="checkbox"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"LabelledBy3" viewIdResName:"lb3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"LabelledBy4" viewIdResName:"lb4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy4" viewIdResName:"db4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy5" viewIdResName:"db5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/cite-expected-android-external.txt b/content/test/data/accessibility/html/cite-expected-android-external.txt deleted file mode 100644 index 2c2219cbd74fd1..00000000000000 --- a/content/test/data/accessibility/html/cite-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++Image text:"Pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++TextView text:"The pipe clicked by SomeOne." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/clickable-ancestor-expected-android-external.txt b/content/test/data/accessibility/html/clickable-ancestor-expected-android-external.txt deleted file mode 100644 index b7e66e4621200e..00000000000000 --- a/content/test/data/accessibility/html/clickable-ancestor-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView text:"Checking nodes marked as clickable" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Generic div" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Heading" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View clickable actions:[CLICK, AX_FOCUS] bundle:[chromeRole="group", clickableScore="200"] -++++TextView text:"Paragraph with click handler on parent and should be not marked as clickable" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", clickableScore="100"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/code-expected-android-external.txt b/content/test/data/accessibility/html/code-expected-android-external.txt deleted file mode 100644 index 4a33aaaa3932ef..00000000000000 --- a/content/test/data/accessibility/html/code-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"A piece of computer code" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/col-expected-android-external.txt b/content/test/data/accessibility/html/col-expected-android-external.txt deleted file mode 100644 index ef0a92c5c136ef..00000000000000 --- a/content/test/data/accessibility/html/col-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=2, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Browser" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++View text:"Rendering Engine" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Chrome" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"Blink" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/colgroup-expected-android-external.txt b/content/test/data/accessibility/html/colgroup-expected-android-external.txt deleted file mode 100644 index eef87a06e0ca09..00000000000000 --- a/content/test/data/accessibility/html/colgroup-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=2, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Single" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++View text:"Pair" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"A" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"AA" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/combobox-optgroup-expected-android-external.txt b/content/test/data/accessibility/html/combobox-optgroup-expected-android-external.txt deleted file mode 100644 index ed230ff1086243..00000000000000 --- a/content/test/data/accessibility/html/combobox-optgroup-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"Mercedes Label" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/contenteditable-descendants-expected-android-external.txt b/content/test/data/accessibility/html/contenteditable-descendants-expected-android-external.txt deleted file mode 100644 index 2bc4b611b1afdb..00000000000000 --- a/content/test/data/accessibility/html/contenteditable-descendants-expected-android-external.txt +++ /dev/null @@ -1,20 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++EditText text:"A contenteditable with a link and an and a .\n\nAlways expose editable tables as tables.\nEditable list item." clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="genericContainer", clickableScore="200", hasImage="true"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph", clickableScore="100", hasImage="true"] -++++++TextView text:"A contenteditable with a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++View text:"null" contentDescription:"link" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/contenteditable-descendants.html#"] -++++++++TextView text:"link" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:" and an " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++Image text:"Image" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", clickableScore="100", hasImage="true", roleDescription="graphic"] -++++++TextView text:" and a " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++++++TextView text:"." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++GridView CollectionInfo:[rows=1, cols=1] actions:[AX_FOCUS] bundle:[chromeRole="table", clickableScore="100", roleDescription="table"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="row", clickableScore="100"] -++++++++View text:"Always expose editable tables as tables." CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell", clickableScore="100"] -++++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list", clickableScore="100"] -++++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem", clickableScore="100"] -++++++++View text:"1. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker", clickableScore="100"] -++++++++TextView text:"Editable list item." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:"Non-editable paragraph." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++EditText text:"Should keep the role but change the state." clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="paragraph", clickableScore="200"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-android-external.txt b/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-android-external.txt deleted file mode 100644 index 84155720d763a3..00000000000000 --- a/content/test/data/accessibility/html/contenteditable-with-embedded-contenteditables-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++EditText text:"This is editable.\n\nThis is not editable.\n\n\nBut this one is.\n\nSo is this one." clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="genericContainer", clickableScore="200"] -++++TextView text:"This is editable." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", clickableScore="100"] -++++TextView text:"This is not editable." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"\n" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="lineBreak", clickableScore="100", offscreen="true"] -++++EditText text:"But this one is." clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="paragraph", clickableScore="200"] -++++EditText text:"So is this one." clickable editable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="paragraph", clickableScore="200"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-android-external.txt b/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-android-external.txt deleted file mode 100644 index 3ad28d27cfa8fc..00000000000000 --- a/content/test/data/accessibility/html/contenteditable-with-no-descendants-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="genericContainer", clickableScore="200", hint="label"] -++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="genericContainer", clickableScore="200", hint="description"] -++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="genericContainer", clickableScore="200", hint="title"] -++TextView text:"description" viewIdResName:"description" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/continuations-expected-android-external.txt b/content/test/data/accessibility/html/continuations-expected-android-external.txt deleted file mode 100644 index 90be058892ded8..00000000000000 --- a/content/test/data/accessibility/html/continuations-expected-android-external.txt +++ /dev/null @@ -1,25 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Group 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++Button text:"Before" viewIdResName:"before" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++++TextView text:"After" viewIdResName:"after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View text:"Group 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++TextView text:"Before" viewIdResName:"before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"After" viewIdResName:"after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View text:"Group 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"Before" viewIdResName:"before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++View viewIdResName:"ever" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"Ever " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++++View text:"null" contentDescription:"After" viewIdResName:"after" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/continuations.html#"] -++++++++TextView text:"After" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"Group 4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++TextView text:"Before" viewIdResName:"before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"After" viewIdResName:"after" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View text:"Group 5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++TextView text:"Italic only " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"italic and bold" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"Wow, a block!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"Wow, another block!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"More italic and bold text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" More italic text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/dd-expected-android-external.txt b/content/test/data/accessibility/html/dd-expected-android-external.txt deleted file mode 100644 index 4f5bfc9909cc1f..00000000000000 --- a/content/test/data/accessibility/html/dd-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="descriptionList"] -++++View text:"Coffee" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListTerm"] -++++View text:"Black hot drink" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListDetail", roleDescription="definition"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/del-expected-android-external.txt b/content/test/data/accessibility/html/del-expected-android-external.txt deleted file mode 100644 index 254b5957b1af5c..00000000000000 --- a/content/test/data/accessibility/html/del-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"I am " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"vegetarian" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentDeletion", roleDescription="deletion"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/details-expected-android-external.txt b/content/test/data/accessibility/html/details-expected-android-external.txt deleted file mode 100644 index fd2b4fb3c8917e..00000000000000 --- a/content/test/data/accessibility/html/details-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"details tag" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"details tag open" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COLLAPSE] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++++TextView text:"The details tag with open specifies that the details should be visible (open) to the user." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/dfn-expected-android-external.txt b/content/test/data/accessibility/html/dfn-expected-android-external.txt deleted file mode 100644 index 96ee5152111864..00000000000000 --- a/content/test/data/accessibility/html/dfn-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Web Browser A computer program with a graphical user interface for displaying HTML files, used to navigate the World Wide Web." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/dialog-expected-android-external.txt b/content/test/data/accessibility/html/dialog-expected-android-external.txt deleted file mode 100644 index 9f749026ce4f61..00000000000000 --- a/content/test/data/accessibility/html/dialog-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++Dialog text:"Text in dialog" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="dialog", roleDescription="dialog"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/disabled-expected-android-external.txt b/content/test/data/accessibility/html/disabled-expected-android-external.txt deleted file mode 100644 index 4aaebb5eb032c8..00000000000000 --- a/content/test/data/accessibility/html/disabled-expected-android-external.txt +++ /dev/null @@ -1,13 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++CheckBox text:"Enabled" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++CheckBox text:"Disabled" checkable clickable disabled actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", roleDescription="checkbox"] -++Button text:"Enabled" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++Button text:"Disabled" clickable disabled actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", roleDescription="button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++TextView text:"Enabled form " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++CheckBox text:"Checkbox" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View disabled actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++TextView text:"Disabled form " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++CheckBox text:"Checkbox" checkable clickable disabled focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", roleDescription="checkbox"] -++++Button text:"Button" clickable disabled focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/div-expected-android-external.txt b/content/test/data/accessibility/html/div-expected-android-external.txt deleted file mode 100644 index eb2bceffa80cbd..00000000000000 --- a/content/test/data/accessibility/html/div-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Unfocusable div" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Focusable div" focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/dl-expected-android-external.txt b/content/test/data/accessibility/html/dl-expected-android-external.txt deleted file mode 100644 index 70f14d03cc8fc9..00000000000000 --- a/content/test/data/accessibility/html/dl-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="descriptionList"] -++++View text:"Term" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListTerm"] -++++View text:"Description" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListDetail", roleDescription="definition"] -++View text:"Definition" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="definition", roleDescription="definition"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/dt-expected-android-external.txt b/content/test/data/accessibility/html/dt-expected-android-external.txt deleted file mode 100644 index 4f5bfc9909cc1f..00000000000000 --- a/content/test/data/accessibility/html/dt-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="descriptionList"] -++++View text:"Coffee" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListTerm"] -++++View text:"Black hot drink" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="descriptionListDetail", roleDescription="definition"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/element-class-id-src-attr-expected-android-external.txt b/content/test/data/accessibility/html/element-class-id-src-attr-expected-android-external.txt deleted file mode 100644 index 7b0e8efc237a79..00000000000000 --- a/content/test/data/accessibility/html/element-class-id-src-attr-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++TextView text:"Image" viewIdResName:"headerID" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++Image text:"ImageAlt" viewIdResName:"imageID" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/greenbox.png"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/em-expected-android-external.txt b/content/test/data/accessibility/html/em-expected-android-external.txt deleted file mode 100644 index 63717d278c31a5..00000000000000 --- a/content/test/data/accessibility/html/em-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"One word is emphasized." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/embed-expected-android-external.txt b/content/test/data/accessibility/html/embed-expected-android-external.txt deleted file mode 100644 index 9d80d0188663ec..00000000000000 --- a/content/test/data/accessibility/html/embed-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="embeddedObject", roleDescription="object"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/fieldset-expected-android-external.txt b/content/test/data/accessibility/html/fieldset-expected-android-external.txt deleted file mode 100644 index 4a691544e55b4f..00000000000000 --- a/content/test/data/accessibility/html/fieldset-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"Browser Engines:" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++++View text:"Browser Engines:" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="legend"] -++View text:"Which cake do you prefer?" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="legend"] -++++++TextView text:"Which cake do you prefer?" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 2"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/figcaption-expected-android-external.txt b/content/test/data/accessibility/html/figcaption-expected-android-external.txt deleted file mode 100644 index d7fda8e5f5c1aa..00000000000000 --- a/content/test/data/accessibility/html/figcaption-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View text:"Fig.1 - A green Box" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="figure", hasImage="true", roleDescription="graphic"] -++++Image text:"This is a green box." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/greenbox.png"] -++++View text:"Fig.1 - A green Box" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="figcaption"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/figure-expected-android-external.txt b/content/test/data/accessibility/html/figure-expected-android-external.txt deleted file mode 100644 index e3d7c99505b539..00000000000000 --- a/content/test/data/accessibility/html/figure-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="figure", hasImage="true", roleDescription="graphic"] -++++Image text:"Sunspots" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/fixed-width-text-expected-android-external.txt b/content/test/data/accessibility/html/fixed-width-text-expected-android-external.txt deleted file mode 100644 index 14ad8517189866..00000000000000 --- a/content/test/data/accessibility/html/fixed-width-text-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Hello,\nWorld" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/footer-expected-android-external.txt b/content/test/data/accessibility/html/footer-expected-android-external.txt deleted file mode 100644 index 013110c3e16625..00000000000000 --- a/content/test/data/accessibility/html/footer-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Footer element" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footer", roleDescription="footer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/footer-inside-other-section-expected-android-external.txt b/content/test/data/accessibility/html/footer-inside-other-section-expected-android-external.txt deleted file mode 100644 index b01c29fbbfcdae..00000000000000 --- a/content/test/data/accessibility/html/footer-inside-other-section-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="footerAsNonLandmark"] -++++++TextView text:"footer inside article." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="footerAsNonLandmark"] -++++++TextView text:"footer inside section." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="footerAsNonLandmark"] -++++++TextView text:"footer inside main." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/form-expected-android-external.txt b/content/test/data/accessibility/html/form-expected-android-external.txt deleted file mode 100644 index 4440ddfbb6af12..00000000000000 --- a/content/test/data/accessibility/html/form-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++Button text:"Submit" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View text:"Name" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="form"] -++++Button text:"Submit" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/frameset-expected-android-external.txt b/content/test/data/accessibility/html/frameset-expected-android-external.txt deleted file mode 100644 index f735a4c9b66f15..00000000000000 --- a/content/test/data/accessibility/html/frameset-expected-android-external.txt +++ /dev/null @@ -1,15 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++++++TextView text:"My favorite browser is " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View text:"ABC" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentDeletion", roleDescription="deletion"] -++++++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View text:"Chrome" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentInsertion", roleDescription="insertion"] -++++++++TextView text:"!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++++++TextView text:"This test is to check " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View text:"mark tag" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="mark", roleDescription="highlight"] -++++++++TextView text:"." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/header-expected-android-external.txt b/content/test/data/accessibility/html/header-expected-android-external.txt deleted file mode 100644 index 39b47beb743abf..00000000000000 --- a/content/test/data/accessibility/html/header-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Chromium Browser" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="header", roleDescription="banner"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/header-inside-other-section-expected-android-external.txt b/content/test/data/accessibility/html/header-inside-other-section-expected-android-external.txt deleted file mode 100644 index a7cd68f1973f14..00000000000000 --- a/content/test/data/accessibility/html/header-inside-other-section-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="headerAsNonLandmark"] -++++++TextView text:"Header inside article." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="headerAsNonLandmark"] -++++++TextView text:"Header inside section." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="headerAsNonLandmark"] -++++++TextView text:"Header inside main." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/heading-expected-android-external.txt b/content/test/data/accessibility/html/heading-expected-android-external.txt deleted file mode 100644 index f8ecfc14d31dfd..00000000000000 --- a/content/test/data/accessibility/html/heading-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Heading 1" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++TextView text:"Heading 2" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 2"] -++TextView text:"Heading 3" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++TextView text:"Heading 4" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 4"] -++TextView text:"Heading 5" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 5"] -++TextView text:"Heading 6" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 6"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/heading-with-tabIndex-expected-android-external.txt b/content/test/data/accessibility/html/heading-with-tabIndex-expected-android-external.txt deleted file mode 100644 index 080f43f8705fe4..00000000000000 --- a/content/test/data/accessibility/html/heading-with-tabIndex-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Heading 2, no tabIndex" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 2"] -++TextView text:"Heading 1, tabIndex of negative 1" focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++TextView text:"Heading 3, tabIndex of 0" focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 3"] -++TextView text:"Heading 4, tabIndex of 1" focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 4"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/hr-expected-android-external.txt b/content/test/data/accessibility/html/hr-expected-android-external.txt deleted file mode 100644 index 9f4a43383d0491..00000000000000 --- a/content/test/data/accessibility/html/hr-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View text:"Dividing line" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="splitter", roleDescription="splitter"] -++TextView text:"Middle." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="splitter", roleDescription="splitter"] -++TextView text:"After." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/html-expected-android-external.txt b/content/test/data/accessibility/html/html-expected-android-external.txt deleted file mode 100644 index a2911a9c1a28ab..00000000000000 --- a/content/test/data/accessibility/html/html-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView text:"HTML element" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++View text:"BODY element" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Button element" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/i-expected-android-external.txt b/content/test/data/accessibility/html/i-expected-android-external.txt deleted file mode 100644 index f33d1bc6185ec3..00000000000000 --- a/content/test/data/accessibility/html/i-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This is to check italic property using i tag." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/id-expected-android-external.txt b/content/test/data/accessibility/html/id-expected-android-external.txt deleted file mode 100644 index 283ee446b01ceb..00000000000000 --- a/content/test/data/accessibility/html/id-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"No id" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"Has id" viewIdResName:"para2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-aria-hidden-expected-android-external.txt b/content/test/data/accessibility/html/iframe-aria-hidden-expected-android-external.txt deleted file mode 100644 index 223f140190f4da..00000000000000 --- a/content/test/data/accessibility/html/iframe-aria-hidden-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View notVisibleToUser actions:[AX_FOCUS] bundle:[chromeRole="iframe", offscreen="true"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", offscreen="true"] -++View notVisibleToUser actions:[AX_FOCUS] bundle:[chromeRole="iframe", offscreen="true"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", offscreen="true"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-coordinates-cross-process-expected-android-external.txt b/content/test/data/accessibility/html/iframe-coordinates-cross-process-expected-android-external.txt deleted file mode 100644 index 36bdb48588a770..00000000000000 --- a/content/test/data/accessibility/html/iframe-coordinates-cross-process-expected-android-external.txt +++ /dev/null @@ -1,13 +0,0 @@ -WebView focusable focused actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View viewIdResName:"frame1" actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View text:"Error" focusable scrollable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++++++++TextView text:"Could not load the requested resource.\nError code: -6 (net::ERR_FILE_NOT_FOUND)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View viewIdResName:"frame2" actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View text:"Error" focusable scrollable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_DOWN, SCROLL_RIGHT, PAGE_DOWN, PAGE_RIGHT] bundle:[chromeRole="rootWebArea"] -++++++++TextView text:"Could not load the requested resource.\nError code: -6 (net::ERR_FILE_NOT_FOUND)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-cross-process-expected-android-external.txt b/content/test/data/accessibility/html/iframe-cross-process-expected-android-external.txt deleted file mode 100644 index eff08d8a575472..00000000000000 --- a/content/test/data/accessibility/html/iframe-cross-process-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before frame" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View text:"Error" focusable scrollable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++++++++TextView text:"Could not load the requested resource.\nError code: -6 (net::ERR_FILE_NOT_FOUND)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"After frame" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-empty-positioned-expected-android-external.txt b/content/test/data/accessibility/html/iframe-empty-positioned-expected-android-external.txt deleted file mode 100644 index ae6dcf998755a8..00000000000000 --- a/content/test/data/accessibility/html/iframe-empty-positioned-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe", offscreen="true"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", offscreen="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe", offscreen="true"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", offscreen="true"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-expected-android-external.txt b/content/test/data/accessibility/html/iframe-expected-android-external.txt deleted file mode 100644 index 3e5ebdd9e50e2b..00000000000000 --- a/content/test/data/accessibility/html/iframe-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-focus-expected-android-external.txt b/content/test/data/accessibility/html/iframe-focus-expected-android-external.txt deleted file mode 100644 index 19cc36c77e47d1..00000000000000 --- a/content/test/data/accessibility/html/iframe-focus-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_RIGHT, PAGE_RIGHT] bundle:[chromeRole="rootWebArea"] -++++++++Button text:"Button with focus handler" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++++++++TextView viewIdResName:"focused_log" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_RIGHT, PAGE_RIGHT] bundle:[chromeRole="rootWebArea"] -++++++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++++++Button text:"Ordinary Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-presentational-expected-android-external.txt b/content/test/data/accessibility/html/iframe-presentational-expected-android-external.txt deleted file mode 100644 index e4ea816f1371e2..00000000000000 --- a/content/test/data/accessibility/html/iframe-presentational-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="iframePresentational"] -++++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-transform-expected-android-external.txt b/content/test/data/accessibility/html/iframe-transform-expected-android-external.txt deleted file mode 100644 index cb29266c5a7496..00000000000000 --- a/content/test/data/accessibility/html/iframe-transform-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++++++Image actions:[AX_FOCUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic"] -++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++++++Image actions:[AX_FOCUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/iframe-traversal-expected-android-external.txt b/content/test/data/accessibility/html/iframe-traversal-expected-android-external.txt deleted file mode 100644 index 4fd2618bff8d81..00000000000000 --- a/content/test/data/accessibility/html/iframe-traversal-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before iframe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View text:"Error" focusable scrollable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++++++++TextView text:"Could not load the requested resource.\nError code: -6 (net::ERR_FILE_NOT_FOUND)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"After iframe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/img-empty-alt-expected-android-external.txt b/content/test/data/accessibility/html/img-empty-alt-expected-android-external.txt deleted file mode 100644 index 36d19446c5442e..00000000000000 --- a/content/test/data/accessibility/html/img-empty-alt-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="image", hasImage="true", offscreen="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/read.jpg"] -++++Image text:"read" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/read.jpg"] -++++Image text:"full" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/read.jpg"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/img-expected-android-external.txt b/content/test/data/accessibility/html/img-expected-android-external.txt deleted file mode 100644 index fdb0c9593ff2b0..00000000000000 --- a/content/test/data/accessibility/html/img-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++Image text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText", offscreen="true"] -++++Image text:"SVG face" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/svg-face.svg"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/img-link-empty-alt-expected-android-external.txt b/content/test/data/accessibility/html/img-link-empty-alt-expected-android-external.txt deleted file mode 100644 index 34463c48cca393..00000000000000 --- a/content/test/data/accessibility/html/img-link-empty-alt-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++View text:"null" contentDescription:"unread " clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo"] -++++++TextView text:"unread " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"read " clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo"] -++++++TextView text:"read " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"read " clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo"] -++++++TextView text:"read " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"read" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hasImage="true", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo"] -++++++Image text:"read" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", clickableScore="100", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/read.jpg"] -++++++TextView text:"read" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/in-page-links-expected-android-external.txt b/content/test/data/accessibility/html/in-page-links-expected-android-external.txt deleted file mode 100644 index ea4ae043898c00..00000000000000 --- a/content/test/data/accessibility/html/in-page-links-expected-android-external.txt +++ /dev/null @@ -1,31 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"null" contentDescription:"Empty anchor" viewIdResName:"anchor1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#emptyAnchor"] -++++TextView text:"Empty anchor" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"null" contentDescription:"Anchor with content" viewIdResName:"anchor2" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#anchorWithContent"] -++++TextView text:"Anchor with content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"null" contentDescription:"Anchor with ID" viewIdResName:"anchor3" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#anchorWithID"] -++++TextView text:"Anchor with ID" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"null" contentDescription:"Empty span" viewIdResName:"anchor4" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#emptySpan"] -++++TextView text:"Empty span" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"null" contentDescription:"Span with content" viewIdResName:"anchor5" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#spanWithContent"] -++++TextView text:"Span with content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View text:"null" contentDescription:"Paragraph with content" viewIdResName:"anchor6" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/in-page-links.html#paragraphWithContent"] -++++TextView text:"Paragraph with content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", offscreen="true"] -++++TextView text:"After empty anchor" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Anchor with content" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Anchor with ID" viewIdResName:"anchorWithID" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView viewIdResName:"emptySpan" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", offscreen="true"] -++++TextView text:"After empty span" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Span with content" viewIdResName:"spanWithContent" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Paragraph with content" viewIdResName:"paragraphWithContent" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-button-expected-android-external.txt b/content/test/data/accessibility/html/input-button-expected-android-external.txt deleted file mode 100644 index 819803213d9f82..00000000000000 --- a/content/test/data/accessibility/html/input-button-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++++Button text:"Name" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hint="Description", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-checkbox-label-expected-android-external.txt b/content/test/data/accessibility/html/input-checkbox-label-expected-android-external.txt deleted file mode 100644 index 6df49e4894b56f..00000000000000 --- a/content/test/data/accessibility/html/input-checkbox-label-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++CheckBox text:"Checkbox Title" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-color-expected-android-external.txt b/content/test/data/accessibility/html/input-color-expected-android-external.txt deleted file mode 100644 index d18c0223f8011b..00000000000000 --- a/content/test/data/accessibility/html/input-color-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"#FF9900" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="colorWell", clickableScore="300", roleDescription="color picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-color-with-popup-open-expected-android-external.txt b/content/test/data/accessibility/html/input-color-with-popup-open-expected-android-external.txt deleted file mode 100644 index d18c0223f8011b..00000000000000 --- a/content/test/data/accessibility/html/input-color-with-popup-open-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"#FF9900" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="colorWell", clickableScore="300", roleDescription="color picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-date-expected-android-external.txt b/content/test/data/accessibility/html/input-date-expected-android-external.txt deleted file mode 100644 index 653cbe062070b6..00000000000000 --- a/content/test/data/accessibility/html/input-date-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", hint="When", roleDescription="date picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-date-with-popup-open-expected-android-external.txt b/content/test/data/accessibility/html/input-date-with-popup-open-expected-android-external.txt deleted file mode 100644 index 510d01de26e15f..00000000000000 --- a/content/test/data/accessibility/html/input-date-with-popup-open-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-date-with-popup-open-multiple-expected-android-external.txt b/content/test/data/accessibility/html/input-date-with-popup-open-multiple-expected-android-external.txt deleted file mode 100644 index 34d7a75033e16e..00000000000000 --- a/content/test/data/accessibility/html/input-date-with-popup-open-multiple-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", hint="Third date picker", roleDescription="date picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-date-with-popup-open-multiple-for-win-expected-android-external.txt b/content/test/data/accessibility/html/input-date-with-popup-open-multiple-for-win-expected-android-external.txt deleted file mode 100644 index 34d7a75033e16e..00000000000000 --- a/content/test/data/accessibility/html/input-date-with-popup-open-multiple-for-win-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", roleDescription="date picker"] -++++Spinner text:"2008-09-01" clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="date", clickableScore="300", hint="Third date picker", roleDescription="date picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-datetime-expected-android-external.txt b/content/test/data/accessibility/html/input-datetime-expected-android-external.txt deleted file mode 100644 index fe9d6d009c49f3..00000000000000 --- a/content/test/data/accessibility/html/input-datetime-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"1/1/2015 1:00AM" clickable editable focusable inputType:4 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++EditText text:"1/1/2015 1:00AM" clickable editable focusable inputType:4 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Launch"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-datetime-local-expected-android-external.txt b/content/test/data/accessibility/html/input-datetime-local-expected-android-external.txt deleted file mode 100644 index cd4bf0a090d047..00000000000000 --- a/content/test/data/accessibility/html/input-datetime-local-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner clickable focusable inputType:4 actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="dateTime", clickableScore="300", roleDescription="local date and time picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-email-expected-android-external.txt b/content/test/data/accessibility/html/input-email-expected-android-external.txt deleted file mode 100644 index 0ee9e0e684936c..00000000000000 --- a/content/test/data/accessibility/html/input-email-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"someone@example.com" clickable editable focusable inputType:209 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-file-expected-android-external.txt b/content/test/data/accessibility/html/input-file-expected-android-external.txt deleted file mode 100644 index be2e67ad28e764..00000000000000 --- a/content/test/data/accessibility/html/input-file-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"No file chosen, Choose File" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-image-expected-android-external.txt b/content/test/data/accessibility/html/input-image-expected-android-external.txt deleted file mode 100644 index b0273d16d085e3..00000000000000 --- a/content/test/data/accessibility/html/input-image-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View viewIdResName:"body" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Submit" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-list-expected-android-external.txt b/content/test/data/accessibility/html/input-list-expected-android-external.txt deleted file mode 100644 index f1834c47f5e1ca..00000000000000 --- a/content/test/data/accessibility/html/input-list-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="labelText"] -++++++TextView text:"Choose a pokemon " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++EditText canOpenPopUp clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textFieldWithComboBox", clickableScore="300", hint="Choose a pokemon"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-month-expected-android-external.txt b/content/test/data/accessibility/html/input-month-expected-android-external.txt deleted file mode 100644 index 7ce2028b4a38a2..00000000000000 --- a/content/test/data/accessibility/html/input-month-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner clickable focusable inputType:20 actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="dateTime", clickableScore="300", roleDescription="month picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-number-expected-android-external.txt b/content/test/data/accessibility/html/input-number-expected-android-external.txt deleted file mode 100644 index dcdb46670280f3..00000000000000 --- a/content/test/data/accessibility/html/input-number-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"1" clickable editable focusable inputType:2 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, SET_PROGRESS, IME_ENTER] bundle:[chromeRole="spinButton", clickableScore="300", roleDescription="spin button"] -++++EditText text:"6" clickable editable focusable inputType:2 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, SET_PROGRESS, IME_ENTER] bundle:[chromeRole="spinButton", clickableScore="300", roleDescription="spin button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-radio-checkbox-label-expected-android-external.txt b/content/test/data/accessibility/html/input-radio-checkbox-label-expected-android-external.txt deleted file mode 100644 index d1df339e62ffbd..00000000000000 --- a/content/test/data/accessibility/html/input-radio-checkbox-label-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++RadioButton text:"label ignored for radio button" viewIdResName:"radio1" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++CheckBox text:"label ignored for checkbox" viewIdResName:"checkbox1" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] -++++View text:"label exposed for radio button " focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++++TextView text:"label exposed for radio button " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++RadioButton text:"label exposed for radio button" viewIdResName:"radio2" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++View text:"label exposed for checkbox " focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++++TextView text:"label exposed for checkbox " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++CheckBox text:"label exposed for checkbox" viewIdResName:"checkbox2" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="checkBox", clickableScore="300", roleDescription="checkbox"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-radio-expected-android-external.txt b/content/test/data/accessibility/html/input-radio-expected-android-external.txt deleted file mode 100644 index d2bd2ac8e63d8f..00000000000000 --- a/content/test/data/accessibility/html/input-radio-expected-android-external.txt +++ /dev/null @@ -1,13 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++RadioButton checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++TextView text:"Radio1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"\n" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="lineBreak", offscreen="true"] -++++RadioButton checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++TextView text:"Radio2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++RadioButton text:"Radio3" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++RadioButton text:"Radio4" checkable checked clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++RadioButton text:"Radio5" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++RadioButton text:"Radio6" checkable checked clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-radio-in-menu-expected-android-external.txt b/content/test/data/accessibility/html/input-radio-in-menu-expected-android-external.txt deleted file mode 100644 index 5351022d336ecb..00000000000000 --- a/content/test/data/accessibility/html/input-radio-in-menu-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="menu", roleDescription="menu"] -++++RadioButton checkable checked clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++TextView text:"Radio0 " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++RadioButton checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++TextView text:"Radio1 " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++RadioButton text:"Radio2" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="menu", roleDescription="menu"] -++++RadioButton text:"Radio3" checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++RadioButton checkable clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] -++++RadioButton checkable checked clickable focusable actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="radioButton", clickableScore="300", roleDescription="radio button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-range-expected-android-external.txt b/content/test/data/accessibility/html/input-range-expected-android-external.txt deleted file mode 100644 index c8acf7fac5ee7a..00000000000000 --- a/content/test/data/accessibility/html/input-range-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++SeekBar text:"5" clickable focusable RangeInfo:[current=5.0, min=1.0, max=10.0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] -++++SeekBar text:"3" clickable focusable RangeInfo:[current=3.0, min=1.0, max=10.0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] -++++SeekBar text:"Medium" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] -++++SeekBar text:"Friday" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] -++++SeekBar text:"0.2" clickable focusable RangeInfo:[current=0.2, min=-1.0, max=1.0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, SCROLL_BACKWARD, SET_PROGRESS] bundle:[chromeRole="slider", roleDescription="slider"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-reset-expected-android-external.txt b/content/test/data/accessibility/html/input-reset-expected-android-external.txt deleted file mode 100644 index ce02aeff43e500..00000000000000 --- a/content/test/data/accessibility/html/input-reset-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++Button text:"Reset" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-search-expected-android-external.txt b/content/test/data/accessibility/html/input-search-expected-android-external.txt deleted file mode 100644 index a8dfd6c0ea2b74..00000000000000 --- a/content/test/data/accessibility/html/input-search-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"Search terms" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="searchBox", clickableScore="300", roleDescription="search text field"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-submit-expected-android-external.txt b/content/test/data/accessibility/html/input-submit-expected-android-external.txt deleted file mode 100644 index f81a6fed286735..00000000000000 --- a/content/test/data/accessibility/html/input-submit-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++Button text:"First submit in a form is a valid default button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++++Button text:"Second submit in a form not a valid default button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section", hasImage="true"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++Button text:"First image button in a form is a valid default button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hasImage="true", roleDescription="button"] -++++Button text:"Second image button in a form not a valid default button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hasImage="true", roleDescription="button"] -++Button text:"Submit outside of form not a valid default button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-suggestions-source-element-expected-android-external.txt b/content/test/data/accessibility/html/input-suggestions-source-element-expected-android-external.txt deleted file mode 100644 index 96fe1fbc471e9a..00000000000000 --- a/content/test/data/accessibility/html/input-suggestions-source-element-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText canOpenPopUp clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textFieldWithComboBox", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-tel-expected-android-external.txt b/content/test/data/accessibility/html/input-tel-expected-android-external.txt deleted file mode 100644 index b5ce652eb68b3a..00000000000000 --- a/content/test/data/accessibility/html/input-tel-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"123-456-7890" clickable editable focusable inputType:3 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-text-expected-android-external.txt b/content/test/data/accessibility/html/input-text-expected-android-external.txt deleted file mode 100644 index 7541aee7ac30f2..00000000000000 --- a/content/test/data/accessibility/html/input-text-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable scrollable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText clickable editable focusable focused inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[CLEAR_FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Name"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-text-name-calc-expected-android-external.txt b/content/test/data/accessibility/html/input-text-name-calc-expected-android-external.txt deleted file mode 100644 index b42de608ba8483..00000000000000 --- a/content/test/data/accessibility/html/input-text-name-calc-expected-android-external.txt +++ /dev/null @@ -1,27 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++EditText viewIdResName:"c0" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Title0"] -++EditText viewIdResName:"c1" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Label1 Title1"] -++EditText viewIdResName:"c2" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="AriaLabel2 Title2"] -++EditText viewIdResName:"c3" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="LabelledBy3 Title3"] -++EditText viewIdResName:"c4" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Placeholder4"] -++EditText viewIdResName:"c4a" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="ARIA Placeholder4a"] -++EditText viewIdResName:"c4b" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Placeholder4b"] -++EditText viewIdResName:"c5" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Placeholder5 Title5"] -++EditText viewIdResName:"c6" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="LabelledBy6 DescribedBy6"] -++EditText viewIdResName:"c7" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="AriaLabel7 Placeholder7 DescribedBy7"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++View text:"Label1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Label6" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"LabelledBy3" viewIdResName:"lb3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"LabelledBy6" viewIdResName:"lb6" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy6" viewIdResName:"db6" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"DescribedBy7" viewIdResName:"db7" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-text-read-only-expected-android-external.txt b/content/test/data/accessibility/html/input-text-read-only-expected-android-external.txt deleted file mode 100644 index 5c74ca1d41e272..00000000000000 --- a/content/test/data/accessibility/html/input-text-read-only-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable scrollable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText clickable editable disabled focusable focused inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[CLEAR_FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="textField", clickableScore="300", hint="Name"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-text-value-expected-android-external.txt b/content/test/data/accessibility/html/input-text-value-expected-android-external.txt deleted file mode 100644 index 060d096d11cc44..00000000000000 --- a/content/test/data/accessibility/html/input-text-value-expected-android-external.txt +++ /dev/null @@ -1,15 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"l1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++EditText viewIdResName:"i1" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l1"] -++++View text:"l2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++EditText text:"value" viewIdResName:"i2" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l2"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l2"] -++++EditText text:"value *" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l2"] -++++View text:"Email" viewIdResName:"l3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] -++++TextView viewIdResName:"l4" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", offscreen="true"] -++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Email"] -++++EditText text:"value" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Email"] -++++EditText clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l5"] -++++EditText text:"Value" clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="l6"] -++++EditText text:"value" clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300", hint="Name Description"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-time-expected-android-external.txt b/content/test/data/accessibility/html/input-time-expected-android-external.txt deleted file mode 100644 index 36df1fa5f11b2f..00000000000000 --- a/content/test/data/accessibility/html/input-time-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"00:00:00" clickable focusable inputType:36 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="inputTime", clickableScore="300", roleDescription="time picker"] -++++Spinner text:"00:00:00" clickable focusable inputType:36 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="inputTime", clickableScore="300", hint="Breakfast", roleDescription="time picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-time-with-popup-open-expected-android-external.txt b/content/test/data/accessibility/html/input-time-with-popup-open-expected-android-external.txt deleted file mode 100644 index 984879d6f9cdd1..00000000000000 --- a/content/test/data/accessibility/html/input-time-with-popup-open-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner text:"13:50:02.922" clickable focusable inputType:36 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="inputTime", clickableScore="300", roleDescription="time picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-url-expected-android-external.txt b/content/test/data/accessibility/html/input-url-expected-android-external.txt deleted file mode 100644 index 3b5ebf140e9097..00000000000000 --- a/content/test/data/accessibility/html/input-url-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"example.com" error:"Invalid entry" clickable contentInvalid editable focusable inputType:17 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/input-week-expected-android-external.txt b/content/test/data/accessibility/html/input-week-expected-android-external.txt deleted file mode 100644 index 967b9cc37855dd..00000000000000 --- a/content/test/data/accessibility/html/input-week-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Spinner clickable focusable inputType:4 actions:[FOCUS, CLICK, AX_FOCUS] bundle:[chromeRole="dateTime", clickableScore="300", roleDescription="week picker"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/ins-expected-android-external.txt b/content/test/data/accessibility/html/ins-expected-android-external.txt deleted file mode 100644 index 83728cdefb1b65..00000000000000 --- a/content/test/data/accessibility/html/ins-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"My favorite browser is " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"ABC" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentDeletion", roleDescription="deletion"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Chrome" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentInsertion", roleDescription="insertion"] -++++TextView text:"!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/isInteresting-expected-android-external.txt b/content/test/data/accessibility/html/isInteresting-expected-android-external.txt deleted file mode 100644 index d2892b1e5b181c..00000000000000 --- a/content/test/data/accessibility/html/isInteresting-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"A non focusable child of a control should not be interesting on Android" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++TextView text:"Div with click handler" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", clickableScore="200"] -++Button text:"I am interesting" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/label-expected-android-external.txt b/content/test/data/accessibility/html/label-expected-android-external.txt deleted file mode 100644 index 6d69b8631b45c2..00000000000000 --- a/content/test/data/accessibility/html/label-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"Label" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="labelText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/landmark-expected-android-external.txt b/content/test/data/accessibility/html/landmark-expected-android-external.txt deleted file mode 100644 index aed17d4bf0d887..00000000000000 --- a/content/test/data/accessibility/html/landmark-expected-android-external.txt +++ /dev/null @@ -1,94 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"This is a header element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="header", roleDescription="banner"] -++View text:"This is an aside element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++TextView text:"This is an address element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View text:"This is a footer element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footer", roleDescription="footer"] -++View text:"This is a form element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="section"] -++View text:"This is a main element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="main", roleDescription="main"] -++View text:"This is a nav element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++View text:"This is an ARIA application landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="application", roleDescription="application"] -++View text:"This is an ARIA banner landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="banner", roleDescription="banner"] -++View text:"This is an ARIA complementary landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++View text:"This is an ARIA contentinfo landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="contentInfo", roleDescription="content information"] -++View text:"This is an ARIA form landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="form"] -++View text:"This is an ARIA main landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="main", roleDescription="main"] -++View text:"This is an ARIA navigation landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++View text:"This is an ARIA search landmark." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="search", roleDescription="search"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View text:"This should NOT banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"Details" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="figure", roleDescription="graphic"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View text:"This should NOT banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"Details" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="figure", roleDescription="graphic"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View text:"This should NOT have banner role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="headerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View text:"This should NOT footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"Details" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="figure", roleDescription="graphic"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="article", roleDescription="article"] -++++View text:"This should NOT footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="complementary", roleDescription="complementary"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="blockquote", roleDescription="blockquote"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"Details" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="figure", roleDescription="graphic"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] -++View actions:[AX_FOCUS] bundle:[chromeRole="main", roleDescription="main"] -++++View text:"This should NOT have footer role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="footerAsNonLandmark"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/legend-expected-android-external.txt b/content/test/data/accessibility/html/legend-expected-android-external.txt deleted file mode 100644 index 4ccd99b5b1d29a..00000000000000 --- a/content/test/data/accessibility/html/legend-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++View text:"Browser Engines:" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++++View text:"Browser Engines:" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="legend"] -++++++TextView text:"Browser: " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++++TextView text:" Rendering Engine: " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++EditText clickable editable focusable inputType:1 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/li-expected-android-external.txt b/content/test/data/accessibility/html/li-expected-android-external.txt deleted file mode 100644 index 77a442be684507..00000000000000 --- a/content/test/data/accessibility/html/li-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Custom name" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/link-inside-heading-expected-android-external.txt b/content/test/data/accessibility/html/link-inside-heading-expected-android-external.txt deleted file mode 100644 index 647a157cf9b716..00000000000000 --- a/content/test/data/accessibility/html/link-inside-heading-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Link In Heading" clickable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1 link"] -++++View text:"null" contentDescription:"Link In Heading" clickable focusable CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="heading 1 link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/link-inside-heading.html#"] -++++++TextView text:"Link In Heading" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/list-expected-android-external.txt b/content/test/data/accessibility/html/list-expected-android-external.txt deleted file mode 100644 index dfa8a262d25cf9..00000000000000 --- a/content/test/data/accessibility/html/list-expected-android-external.txt +++ /dev/null @@ -1,17 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"tic" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"tac" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"toe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"tic" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"tac" CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"toe" CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/list-item-aria-setsize-unknown-expected-android-external.txt b/content/test/data/accessibility/html/list-item-aria-setsize-unknown-expected-android-external.txt deleted file mode 100644 index e513e7c95fdc09..00000000000000 --- a/content/test/data/accessibility/html/list-item-aria-setsize-unknown-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[hierarchical, rows=8, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Level 1, item 5 of set size unknown" CollectionItemInfo:[rowIndex=4, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++View CollectionItemInfo:[rowIndex=5, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++TextView text:"Level 1, item 6 of set size unknown" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++ListView CollectionInfo:[hierarchical, rows=7, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++++++View text:"Level 2, item 6 of set size unknown" CollectionItemInfo:[rowIndex=5, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++++++View text:"Level 2, item 7 of set size unknown" CollectionItemInfo:[rowIndex=6, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++View text:"Level 1, item 7 of set size 2" CollectionItemInfo:[rowIndex=6, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++View text:"Level 1, item 8 of set size 3" CollectionItemInfo:[rowIndex=7, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/list-item-aria-setsize-unknown-flattened-expected-android-external.txt b/content/test/data/accessibility/html/list-item-aria-setsize-unknown-flattened-expected-android-external.txt deleted file mode 100644 index c7ff673a8f86d4..00000000000000 --- a/content/test/data/accessibility/html/list-item-aria-setsize-unknown-flattened-expected-android-external.txt +++ /dev/null @@ -1,22 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Level 1, item 1 of set size unknown" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"++Level 2, item 1 of set size unknown" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=2, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"++Level 2, item 2 of set size unknown" CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"++Level 2, item 3 of set size unknown" CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=1, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"++++Level 3, item 1 of set size unknown" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=2, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"++++Level 3, item 2 of set size unknown" CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=2, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Level 1, item 2 of set size unknown" CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Level 1, item 3 of set size unknown" CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++ListView CollectionInfo:[hierarchical, rows=0, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++ListView CollectionInfo:[hierarchical, rows=4, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++++View text:"Level Unspecified, aria-setsize attribute does not exist, item 4 of set size 4" CollectionItemInfo:[rowIndex=3, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++ListView CollectionInfo:[hierarchical, rows=5, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++++View text:"Level Unspecified, aria-setsize attribute does not exist, item 5 of set size 5" CollectionItemInfo:[rowIndex=4, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/list-markers-expected-android-external.txt b/content/test/data/accessibility/html/list-markers-expected-android-external.txt deleted file mode 100644 index 8332ce68111df3..00000000000000 --- a/content/test/data/accessibility/html/list-markers-expected-android-external.txt +++ /dev/null @@ -1,17 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"First item properly groups itself despite " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"bolded" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:" text." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"This should also be " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"seen" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:" as a group." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Some " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:"more" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++TextView text:" text." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/main-expected-android-external.txt b/content/test/data/accessibility/html/main-expected-android-external.txt deleted file mode 100644 index bf4f8918eac96f..00000000000000 --- a/content/test/data/accessibility/html/main-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"This is main element." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="main", roleDescription="main"] -++View text:"This is an ARIA role main." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="main", roleDescription="main"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt b/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt deleted file mode 100644 index 5a3cb5170d11d0..00000000000000 --- a/content/test/data/accessibility/html/map-any-contents-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++Image text:"pipe" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/pipe.jpg"] -++++TextView text:"Headings are allowed in a map" CollectionItemInfo:[heading, rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="heading", roleDescription="heading 1"] -++++View text:"null" contentDescription:"pipe1" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/fake.htm"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++++TextView text:"So are " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++View text:"other elements" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="mark", roleDescription="highlight"] -++++++TextView text:"!" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"pipe2" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText", clickableScore="200"] -++++Button text:"Even a button" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/mark-expected-android-external.txt b/content/test/data/accessibility/html/mark-expected-android-external.txt deleted file mode 100644 index 6ee348e71902b2..00000000000000 --- a/content/test/data/accessibility/html/mark-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"This test is to check " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"mark tag" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="mark", roleDescription="highlight"] -++++TextView text:"." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/math-expected-android-external.txt b/content/test/data/accessibility/html/math-expected-android-external.txt deleted file mode 100644 index ad9df7e6397fa9..00000000000000 --- a/content/test/data/accessibility/html/math-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"𝐴2+𝐵2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="math", roleDescription="math"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/menu-expected-android-external.txt b/content/test/data/accessibility/html/menu-expected-android-external.txt deleted file mode 100644 index 21836439348b3a..00000000000000 --- a/content/test/data/accessibility/html/menu-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Menu is deprecated, but it may still be used semantically with list item children. For more history, see crbug.com/87553." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++ListView CollectionInfo:[rows=2, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View text:"Cats" CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] -++++View text:"Dogs" CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listItem"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/meter-expected-android-external.txt b/content/test/data/accessibility/html/meter-expected-android-external.txt deleted file mode 100644 index 58db7b8e08a0bd..00000000000000 --- a/content/test/data/accessibility/html/meter-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++ProgressBar text:"2" RangeInfo:[current=2.0, min=1.0, max=10.0] actions:[AX_FOCUS, NEXT, PREVIOUS, SET_PROGRESS] bundle:[chromeRole="meter", roleDescription="meter"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/navigation-expected-android-external.txt b/content/test/data/accessibility/html/navigation-expected-android-external.txt deleted file mode 100644 index 4419803ff4fe8d..00000000000000 --- a/content/test/data/accessibility/html/navigation-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="navigation", roleDescription="navigation"] -++++View text:"null" contentDescription:"Don't click on me" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///fake/"] -++++++TextView text:"Don't click on me" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/nestedlist-expected-android-external.txt b/content/test/data/accessibility/html/nestedlist-expected-android-external.txt deleted file mode 100644 index 9a80e501b9d953..00000000000000 --- a/content/test/data/accessibility/html/nestedlist-expected-android-external.txt +++ /dev/null @@ -1,30 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This is a multi-leveled list" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++ListView CollectionInfo:[hierarchical, rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"1. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Sports" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++ListView CollectionInfo:[hierarchical, rows=2, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++++++View text:"1. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++++++TextView text:"Tennis" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++++++View text:"2. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++++++TextView text:"basketball" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"2. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Books" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++ListView CollectionInfo:[hierarchical, rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++++++View text:"1. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++++++TextView text:"Oliver Twist" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++++++View text:"2. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++++++TextView text:"Kindred" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++++++View text:"3. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++++++TextView text:"The Promise of Sleep" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"3. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Recipes" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++ListView CollectionInfo:[hierarchical, rows=0, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/object-expected-android-external.txt b/content/test/data/accessibility/html/object-expected-android-external.txt deleted file mode 100644 index e1ecb4e9f34b71..00000000000000 --- a/content/test/data/accessibility/html/object-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="pluginObject", roleDescription="object"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/offscreen-iframe-content-expected-android-external.txt b/content/test/data/accessibility/html/offscreen-iframe-content-expected-android-external.txt deleted file mode 100644 index 7f029ff8292cc7..00000000000000 --- a/content/test/data/accessibility/html/offscreen-iframe-content-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"iframe_onscreen" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++View text:"iframe_offscreen" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/offscreen-iframe-expected-android-external.txt b/content/test/data/accessibility/html/offscreen-iframe-expected-android-external.txt deleted file mode 100644 index 77012fdf3503b9..00000000000000 --- a/content/test/data/accessibility/html/offscreen-iframe-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, PAGE_DOWN] bundle:[chromeRole="rootWebArea"] -++++++++View text:"iframe_onscreen" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++++++View text:"iframe_offscreen" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group", offscreen="true"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/offscreen-select-expected-android-external.txt b/content/test/data/accessibility/html/offscreen-select-expected-android-external.txt deleted file mode 100644 index 6e20b940a339bd..00000000000000 --- a/content/test/data/accessibility/html/offscreen-select-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"Onscreen 1" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++View text:"Offscreen 1" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/ol-expected-android-external.txt b/content/test/data/accessibility/html/ol-expected-android-external.txt deleted file mode 100644 index 7c2d5071c30190..00000000000000 --- a/content/test/data/accessibility/html/ol-expected-android-external.txt +++ /dev/null @@ -1,21 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"1. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Chrome" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"2. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Safari" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"3. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"IE" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"10. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Android" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"11. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Mac" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"12. " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Windows" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/optgroup-expected-android-external.txt b/content/test/data/accessibility/html/optgroup-expected-android-external.txt deleted file mode 100644 index f3bdfcff0cd985..00000000000000 --- a/content/test/data/accessibility/html/optgroup-expected-android-external.txt +++ /dev/null @@ -1,12 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View viewIdResName:"listbox" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++++View notVisibleToUser actions:[AX_FOCUS] bundle:[chromeRole="menuListPopup"] -++++++++View text:"One" viewIdResName:"listbox_option_enabled_one" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Two" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Three" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Four" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"One" viewIdResName:"listbox_option_disabled_one" clickable disabled notVisibleToUser actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Two" clickable disabled notVisibleToUser actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Three" clickable disabled notVisibleToUser actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Four" clickable disabled notVisibleToUser actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/output-expected-android-external.txt b/content/test/data/accessibility/html/output-expected-android-external.txt deleted file mode 100644 index 05275a41f50dbb..00000000000000 --- a/content/test/data/accessibility/html/output-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="section"] -++++EditText clickable editable focusable inputType:2 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, SET_PROGRESS, IME_ENTER] bundle:[chromeRole="spinButton", clickableScore="300", roleDescription="spin button"] -++++TextView text:" + " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++EditText clickable editable focusable inputType:2 textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, PASTE, SET_TEXT, SET_PROGRESS, IME_ENTER] bundle:[chromeRole="spinButton", clickableScore="300", roleDescription="spin button"] -++++TextView text:" =" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="status", offscreen="true", roleDescription="status"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/overflow-actions-expected-android-external.txt b/content/test/data/accessibility/html/overflow-actions-expected-android-external.txt deleted file mode 100644 index 61b9aa59eb64d6..00000000000000 --- a/content/test/data/accessibility/html/overflow-actions-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, PAGE_DOWN] bundle:[chromeRole="genericContainer"] -++++TextView text:"Example Paragraph 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Example Paragraph 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", offscreen="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"Example Paragraph 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Example Paragraph 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph", offscreen="true"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/p-expected-android-external.txt b/content/test/data/accessibility/html/p-expected-android-external.txt deleted file mode 100644 index 57bd1a2fa8ba8f..00000000000000 --- a/content/test/data/accessibility/html/p-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:"Paragraph" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"After" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/param-expected-android-external.txt b/content/test/data/accessibility/html/param-expected-android-external.txt deleted file mode 100644 index e1ecb4e9f34b71..00000000000000 --- a/content/test/data/accessibility/html/param-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="pluginObject", roleDescription="object"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/picture-expected-android-external.txt b/content/test/data/accessibility/html/picture-expected-android-external.txt deleted file mode 100644 index 5b90f30ba980e5..00000000000000 --- a/content/test/data/accessibility/html/picture-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"x" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/400.webp"] -++++Image text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/400.webp"] -++++Image text:"400" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/400.webp"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/portal-expected-android-external.txt b/content/test/data/accessibility/html/portal-expected-android-external.txt deleted file mode 100644 index 20eac3be7f740b..00000000000000 --- a/content/test/data/accessibility/html/portal-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", offscreen="true"] -++TextView text:"After portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/portal-with-widget-inside-expected-android-external.txt b/content/test/data/accessibility/html/portal-with-widget-inside-expected-android-external.txt deleted file mode 100644 index 20eac3be7f740b..00000000000000 --- a/content/test/data/accessibility/html/portal-with-widget-inside-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", offscreen="true"] -++TextView text:"After portal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/pre-expected-android-external.txt b/content/test/data/accessibility/html/pre-expected-android-external.txt deleted file mode 100644 index c51a66b5c55f7c..00000000000000 --- a/content/test/data/accessibility/html/pre-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This test is to check pre\nformatting." viewIdResName:"pre" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="pre"] -++TextView text:"This test is to check pre\nformatting" viewIdResName:"div-pre" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"This test is to check pre\nformatting." viewIdResName:"div-pre-wrap" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"This test is to check pre formatting." viewIdResName:"div-normal" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/progress-expected-android-external.txt b/content/test/data/accessibility/html/progress-expected-android-external.txt deleted file mode 100644 index 599873db1d7654..00000000000000 --- a/content/test/data/accessibility/html/progress-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++ProgressBar text:"22" RangeInfo:[current=22.0, min=0.0, max=100.0] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="progressIndicator", roleDescription="progress indicator"] -++++ProgressBar text:"indeterminate" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="progressIndicator", roleDescription="progress indicator"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/q-expected-android-external.txt b/content/test/data/accessibility/html/q-expected-android-external.txt deleted file mode 100644 index 6db522688d91ee..00000000000000 --- a/content/test/data/accessibility/html/q-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This is "Chromium Blink" based browser." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/replaced-node-across-trees-expected-android-external.txt b/content/test/data/accessibility/html/replaced-node-across-trees-expected-android-external.txt deleted file mode 100644 index 0297e6fd50e825..00000000000000 --- a/content/test/data/accessibility/html/replaced-node-across-trees-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Before frame" viewIdResName:"s1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="iframe"] -++++++View scrollable actions:[AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++++++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++++++TextView text:"Text in iframe" viewIdResName:"s1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"After frame" viewIdResName:"s2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/ruby-expected-android-external.txt b/content/test/data/accessibility/html/ruby-expected-android-external.txt deleted file mode 100644 index 54027b91ef18c8..00000000000000 --- a/content/test/data/accessibility/html/ruby-expected-android-external.txt +++ /dev/null @@ -1,7 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"ruby base" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="ruby", hint="ruby text"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++View text:"ruby base" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="ruby", hint="ruby text"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"Hi! " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"ruby base" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="ruby", hint="ruby text"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/s-expected-android-external.txt b/content/test/data/accessibility/html/s-expected-android-external.txt deleted file mode 100644 index e96a8d0018f2b5..00000000000000 --- a/content/test/data/accessibility/html/s-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"My car is blue." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/samp-expected-android-external.txt b/content/test/data/accessibility/html/samp-expected-android-external.txt deleted file mode 100644 index 9c311226a438fe..00000000000000 --- a/content/test/data/accessibility/html/samp-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Sample output from a computer program" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/scrollable-expected-android-external.txt b/content/test/data/accessibility/html/scrollable-expected-android-external.txt deleted file mode 100644 index 2d16000546e653..00000000000000 --- a/content/test/data/accessibility/html/scrollable-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"not scrollable" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_RIGHT, PAGE_RIGHT] bundle:[chromeRole="genericContainer"] -++TextView scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, PAGE_DOWN] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/scrollable-overflow-expected-android-external.txt b/content/test/data/accessibility/html/scrollable-overflow-expected-android-external.txt deleted file mode 100644 index 4d6b4dc7388a86..00000000000000 --- a/content/test/data/accessibility/html/scrollable-overflow-expected-android-external.txt +++ /dev/null @@ -1,26 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"no overflow" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"clipped large lots of text more text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++EditText text:"ab cd" clickable editable focusable multiLine scrollable textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, SCROLL_DOWN, PAGE_DOWN, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"tiny" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"x=hidden" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, SCROLL_RIGHT, PAGE_DOWN, PAGE_RIGHT] bundle:[chromeRole="genericContainer"] -++++++TextView text:"x=hidden" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_RIGHT, PAGE_RIGHT] bundle:[chromeRole="genericContainer"] -++++++TextView text:"x=auto" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_RIGHT, PAGE_RIGHT] bundle:[chromeRole="genericContainer"] -++++++TextView text:"x=scroll" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++TextView text:"x=visible" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="group"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"y=hidden" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, SCROLL_RIGHT, PAGE_DOWN, PAGE_RIGHT] bundle:[chromeRole="genericContainer"] -++++++TextView text:"y=hidden" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, PAGE_DOWN] bundle:[chromeRole="genericContainer"] -++++++TextView text:"y=auto" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++View scrollable actions:[AX_FOCUS, SCROLL_FORWARD, SCROLL_DOWN, PAGE_DOWN] bundle:[chromeRole="genericContainer"] -++++++TextView text:"y=scroll" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++++TextView text:"y=visible" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/scrollable-textarea-expected-android-external.txt b/content/test/data/accessibility/html/scrollable-textarea-expected-android-external.txt deleted file mode 100644 index a23e1896ea9b0a..00000000000000 --- a/content/test/data/accessibility/html/scrollable-textarea-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"little" clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] -++++EditText text:"lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text+ lots+of+text" clickable editable focusable multiLine scrollable textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, SCROLL_FORWARD, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, SCROLL_DOWN, PAGE_DOWN, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/section-expected-android-external.txt b/content/test/data/accessibility/html/section-expected-android-external.txt deleted file mode 100644 index bb679f845a3140..00000000000000 --- a/content/test/data/accessibility/html/section-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View text:"An unnamed section element gets the section role." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="section"] -++View text:"name" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="region", roleDescription="region"] -++View text:"Named section element #2 gets the region role" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="region", roleDescription="region"] -++++TextView text:"Named section element #2 gets the region role" viewIdResName:"section1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++View text:"name" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="region", roleDescription="region"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/select-expected-android-external.txt b/content/test/data/accessibility/html/select-expected-android-external.txt deleted file mode 100644 index 7fcd83927095a9..00000000000000 --- a/content/test/data/accessibility/html/select-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"Placeholder option" viewIdResName:"A" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++View text:"Option 2" viewIdResName:"B" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++View text:"Option 1" viewIdResName:"C" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++View text:"0 selected" viewIdResName:"D" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++View viewIdResName:"E" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] -++++++View notVisibleToUser actions:[AX_FOCUS] bundle:[chromeRole="menuListPopup"] -++++++++View text:"Option 1" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Option 2" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] -++++++++View text:"Option 3" clickable focusable notVisibleToUser actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="menuListOption", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/selection-container-expected-android-external.txt b/content/test/data/accessibility/html/selection-container-expected-android-external.txt deleted file mode 100644 index 4f9228493c8f8d..00000000000000 --- a/content/test/data/accessibility/html/selection-container-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"selection_list" viewIdResName:"listbox" canOpenPopUp clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="popUpButton", clickableScore="300", roleDescription="menu pop up button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/selectmenu-expected-android-external.txt b/content/test/data/accessibility/html/selectmenu-expected-android-external.txt deleted file mode 100644 index d373a3e4776bdd..00000000000000 --- a/content/test/data/accessibility/html/selectmenu-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View viewIdResName:"A" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++View text:"Option 1, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Option 2, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Option 3, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++View viewIdResName:"B" actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"Custom selectmenu button" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++++View text:"Option 1, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Option 2, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] -++++++View text:"Option 3, in list, item 1 of 0" clickable focusable CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listBoxOption", clickableScore="200"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/simple_spans-expected-android-external.txt b/content/test/data/accessibility/html/simple_spans-expected-android-external.txt deleted file mode 100644 index bbe49aead90ac6..00000000000000 --- a/content/test/data/accessibility/html/simple_spans-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++TextView text:"Some text" viewIdResName:"s1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"3.14159" viewIdResName:"s2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/small-expected-android-external.txt b/content/test/data/accessibility/html/small-expected-android-external.txt deleted file mode 100644 index 09584c05776141..00000000000000 --- a/content/test/data/accessibility/html/small-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Chromiumopen source project" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/span-expected-android-external.txt b/content/test/data/accessibility/html/span-expected-android-external.txt deleted file mode 100644 index 009be53f352a6a..00000000000000 --- a/content/test/data/accessibility/html/span-expected-android-external.txt +++ /dev/null @@ -1,40 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"This paragraph has text in spans." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"E1. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"space" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"E2. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"space" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"E3. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"null" contentDescription:"space" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++View text:"null" contentDescription:"E4. Eat" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"E4. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++View text:"null" contentDescription:"E5. Eat" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"E5. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++View text:"null" contentDescription:"E6. Eat" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/span.html#"] -++++++TextView text:"E6. Eat" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++TextView text:"K1. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K2. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K3. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K4. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K5. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K6. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K7. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] -++TextView text:"K8. Keep space" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/spans-separated-by-space-expected-android-external.txt b/content/test/data/accessibility/html/spans-separated-by-space-expected-android-external.txt deleted file mode 100644 index 984671ba91ce20..00000000000000 --- a/content/test/data/accessibility/html/spans-separated-by-space-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Hello world" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/strong-expected-android-external.txt b/content/test/data/accessibility/html/strong-expected-android-external.txt deleted file mode 100644 index 8d43a317386352..00000000000000 --- a/content/test/data/accessibility/html/strong-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Strong text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/sub-expected-android-external.txt b/content/test/data/accessibility/html/sub-expected-android-external.txt deleted file mode 100644 index e87871b39f6c5a..00000000000000 --- a/content/test/data/accessibility/html/sub-expected-android-external.txt +++ /dev/null @@ -1,17 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"This text contains " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"subscript" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="subscript"] -++++TextView text:" text." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"H" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="subscript"] -++++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="contentDeletion", roleDescription="deletion"] -++++++++View text:"3" focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="contentInsertion", roleDescription="insertion"] -++++++++View text:"null" contentDescription:"2" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/sub.html#"] -++++++++++TextView text:"better" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer", clickableScore="100"] -++++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++TextView text:"O" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/summary-expected-android-external.txt b/content/test/data/accessibility/html/summary-expected-android-external.txt deleted file mode 100644 index 1fad624e2a7c9d..00000000000000 --- a/content/test/data/accessibility/html/summary-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"details tag" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="disclosureTriangle", clickableScore="300", roleDescription="disclosure triangle"] -++View actions:[AX_FOCUS] bundle:[chromeRole="details"] -++++View text:"name" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, EXPAND] bundle:[chromeRole="disclosureTriangle", clickableScore="300", hint="details #2", roleDescription="disclosure triangle"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/sup-expected-android-external.txt b/content/test/data/accessibility/html/sup-expected-android-external.txt deleted file mode 100644 index 9a7d07f2202029..00000000000000 --- a/content/test/data/accessibility/html/sup-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="paragraph"] -++++TextView text:"This text contains" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"superscript" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="superscript"] -++++TextView text:"text." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-as-object-source-expected-android-external.txt b/content/test/data/accessibility/html/svg-as-object-source-expected-android-external.txt deleted file mode 100644 index e57c8a593098e9..00000000000000 --- a/content/test/data/accessibility/html/svg-as-object-source-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"object without space" focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="pluginObject", roleDescription="object"] -++++View text:"object with space" focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="pluginObject", roleDescription="object"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-child-of-button-expected-android-external.txt b/content/test/data/accessibility/html/svg-child-of-button-expected-android-external.txt deleted file mode 100644 index 39488e52aedff2..00000000000000 --- a/content/test/data/accessibility/html/svg-child-of-button-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Button text:"Search" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", hasImage="true", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-child-of-svg-expected-android-external.txt b/content/test/data/accessibility/html/svg-child-of-svg-expected-android-external.txt deleted file mode 100644 index 8e2851eb50714e..00000000000000 --- a/content/test/data/accessibility/html/svg-child-of-svg-expected-android-external.txt +++ /dev/null @@ -1,6 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"Has two simple children" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="image", hasImage="true", roleDescription="graphic"] -++++Image text:"Has two focusable children" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="group"] -++++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="group"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-desc-in-group-expected-android-external.txt b/content/test/data/accessibility/html/svg-desc-in-group-expected-android-external.txt deleted file mode 100644 index 4f2814ab5ba4b0..00000000000000 --- a/content/test/data/accessibility/html/svg-desc-in-group-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="group", hint="Group with circle and text"] -++++++++TextView text:"hello world" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-expected-android-external.txt b/content/test/data/accessibility/html/svg-expected-android-external.txt deleted file mode 100644 index 0ac6bf1e3f1010..00000000000000 --- a/content/test/data/accessibility/html/svg-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"svg" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="svgRoot", hasImage="true", hint="SVG Title Tag", roleDescription="graphic"] -++++++TextView text:"Test" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-style-element-expected-android-external.txt b/content/test/data/accessibility/html/svg-style-element-expected-android-external.txt deleted file mode 100644 index b1a19ee4d9c0a2..00000000000000 --- a/content/test/data/accessibility/html/svg-style-element-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++Button text:"Kettle" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", clickableScore="300", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-symbol-with-role-expected-android-external.txt b/content/test/data/accessibility/html/svg-symbol-with-role-expected-android-external.txt deleted file mode 100644 index 0bb22b2d64082a..00000000000000 --- a/content/test/data/accessibility/html/svg-symbol-with-role-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++Button text:"Click me!" viewIdResName:"myRect" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", roleDescription="button"] -++++++Button text:"Click me!" viewIdResName:"myRect" clickable actions:[CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="button", roleDescription="button"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-text-alternative-computation-expected-android-external.txt b/content/test/data/accessibility/html/svg-text-alternative-computation-expected-android-external.txt deleted file mode 100644 index 887d5b859dba33..00000000000000 --- a/content/test/data/accessibility/html/svg-text-alternative-computation-expected-android-external.txt +++ /dev/null @@ -1,41 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from aria-labelledby)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from title)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from aria-label)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from title)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from xlink:title)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from xlink:title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Circle (from aria-labelledby)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsSymbol", hasImage="true", roleDescription="graphics symbol"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Circle (from aria-label)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsSymbol", hasImage="true", roleDescription="graphics symbol"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Circle (from title)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsSymbol", hasImage="true", roleDescription="graphics symbol"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Circle (From first use element's title)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsObject", roleDescription="graphics object"] -++++++View text:"Circle (From second use element's title)" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsObject", roleDescription="graphics object"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Rectangle Symbol (From symbol's title)" viewIdResName:"myRect" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++++View text:"Rectangle Symbol (From symbol's title)" viewIdResName:"myRect" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="group"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from aria-describedby)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from aria-description)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from desc)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from aria-label)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from title)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"Link (from title)" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", hint="Link (from xlink:title)", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/foo.html"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="graphicsObject", hint="Circle (From first use element's desc)", roleDescription="graphics object"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="graphicsObject", hint="Circle (From second use element's desc)", roleDescription="graphics object"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"Circle 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsObject", hint="Circle (From first use element's title)", roleDescription="graphics object"] -++++++View text:"Circle 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="graphicsObject", hint="Circle (From second use element's title)", roleDescription="graphics object"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View viewIdResName:"myRect2" actions:[AX_FOCUS] bundle:[chromeRole="group", hint="Rectangle Symbol (From symbol's desc)"] -++++++View viewIdResName:"myRect2" actions:[AX_FOCUS] bundle:[chromeRole="group", hint="Rectangle Symbol (From symbol's desc)"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-with-clickable-rect-expected-android-external.txt b/content/test/data/accessibility/html/svg-with-clickable-rect-expected-android-external.txt deleted file mode 100644 index b17c97110a4089..00000000000000 --- a/content/test/data/accessibility/html/svg-with-clickable-rect-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View viewIdResName:"clickable" clickable actions:[CLICK, AX_FOCUS] bundle:[chromeRole="graphicsSymbol", clickableScore="200", hasImage="true", roleDescription="graphics symbol"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-with-foreign-object-expected-android-external.txt b/content/test/data/accessibility/html/svg-with-foreign-object-expected-android-external.txt deleted file mode 100644 index 71488938ccc26e..00000000000000 --- a/content/test/data/accessibility/html/svg-with-foreign-object-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image actions:[AX_FOCUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++TextView text:"Hello world" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="paragraph"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-with-link-to-document-expected-android-external.txt b/content/test/data/accessibility/html/svg-with-link-to-document-expected-android-external.txt deleted file mode 100644 index 5e720c54713ee0..00000000000000 --- a/content/test/data/accessibility/html/svg-with-link-to-document-expected-android-external.txt +++ /dev/null @@ -1,4 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"svg" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View text:"null" contentDescription:"svg-with-link-to-document" clickable focusable actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="link", clickableScore="300", offscreen="true", roleDescription="link", targetUrl="file:///storage/emulated/0/chromium_tests_root/content/test/data/accessibility/html/svg-with-link-to-document.html#"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/svg-with-non-link-anchors-expected-android-external.txt b/content/test/data/accessibility/html/svg-with-non-link-anchors-expected-android-external.txt deleted file mode 100644 index d39b97208e976f..00000000000000 --- a/content/test/data/accessibility/html/svg-with-non-link-anchors-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea", hasImage="true"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer", hasImage="true"] -++++Image text:"Text descendants" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++++++TextView text:"focusable" focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++++TextView text:"not focusable" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++Image text:"Not text descendants" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="svgRoot", hasImage="true", roleDescription="graphic"] -++++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="group"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/tabindex-expose-children-expected-android-external.txt b/content/test/data/accessibility/html/tabindex-expose-children-expected-android-external.txt deleted file mode 100644 index 07da67c9818ad5..00000000000000 --- a/content/test/data/accessibility/html/tabindex-expose-children-expected-android-external.txt +++ /dev/null @@ -1,10 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTable"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"1." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"2." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++View text:"3. 4." focusable actions:[FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTable"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++++View text:"3." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++++View text:"4." actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-focusable-sections-expected-android-external.txt b/content/test/data/accessibility/html/table-focusable-sections-expected-android-external.txt deleted file mode 100644 index f21388573544de..00000000000000 --- a/content/test/data/accessibility/html/table-focusable-sections-expected-android-external.txt +++ /dev/null @@ -1,17 +0,0 @@ -WebView text:"Table example - focusable thead, tbody, tfoot" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=4, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="rowGroup"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++++View text:"Sum" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++++View text:"Subtraction" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="rowGroup"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++++View text:"10" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++++View text:"7" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++++View text:"2" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++++View text:"4" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View focusable actions:[FOCUS, AX_FOCUS] bundle:[chromeRole="rowGroup"] -++++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++++View text:"12" CollectionItemInfo:[rowIndex=3, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++++View text:"3" CollectionItemInfo:[rowIndex=3, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-layout-expected-android-external.txt b/content/test/data/accessibility/html/table-layout-expected-android-external.txt deleted file mode 100644 index 25d62530cfa8a1..00000000000000 --- a/content/test/data/accessibility/html/table-layout-expected-android-external.txt +++ /dev/null @@ -1,14 +0,0 @@ -WebView text:"Table example #2" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTable"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"6" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"7" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"8" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"9" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-presentation-expected-android-external.txt b/content/test/data/accessibility/html/table-presentation-expected-android-external.txt deleted file mode 100644 index 1221450d620a2c..00000000000000 --- a/content/test/data/accessibility/html/table-presentation-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView text:"Table with role=presentation" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-simple-2-expected-android-external.txt b/content/test/data/accessibility/html/table-simple-2-expected-android-external.txt deleted file mode 100644 index 25d62530cfa8a1..00000000000000 --- a/content/test/data/accessibility/html/table-simple-2-expected-android-external.txt +++ /dev/null @@ -1,14 +0,0 @@ -WebView text:"Table example #2" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTable"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"4" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"5" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"6" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="layoutTableRow"] -++++++View text:"7" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"8" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] -++++++View text:"9" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="layoutTableCell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-spans-expected-android-external.txt b/content/test/data/accessibility/html/table-spans-expected-android-external.txt deleted file mode 100644 index d479cf485d158d..00000000000000 --- a/content/test/data/accessibility/html/table-spans-expected-android-external.txt +++ /dev/null @@ -1,14 +0,0 @@ -WebView text:"Table example with rowspan and colspan" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=2, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"AD" CollectionItemInfo:[rowIndex=0, rowSpan=2, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"BC" CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"EF" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++GridView CollectionInfo:[rows=2, cols=3] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"AD" CollectionItemInfo:[rowIndex=0, rowSpan=2, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"BC" CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=1, colSpan=2] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"EF" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"GH" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=2, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-th-colheader-expected-android-external.txt b/content/test/data/accessibility/html/table-th-colheader-expected-android-external.txt deleted file mode 100644 index 22c92b765dcf6c..00000000000000 --- a/content/test/data/accessibility/html/table-th-colheader-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=2, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Firstname" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++View text:"Lastname" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Jill" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"Smith" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-th-rowheader-expected-android-external.txt b/content/test/data/accessibility/html/table-th-rowheader-expected-android-external.txt deleted file mode 100644 index d561794636aa3d..00000000000000 --- a/content/test/data/accessibility/html/table-th-rowheader-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView text:"Table example - th rowheader" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=2, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Firstname" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rowHeader", roleDescription="row header"] -++++++View text:"Jill" CollectionItemInfo:[rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Lastname" CollectionItemInfo:[heading, rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rowHeader", roleDescription="row header"] -++++++View text:"Smith" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-android-external.txt b/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-android-external.txt deleted file mode 100644 index f8f97082627493..00000000000000 --- a/content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-android-external.txt +++ /dev/null @@ -1,14 +0,0 @@ -WebView text:"Table example - thead, tbody, tfoot" focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="rootWebArea"] -++GridView CollectionInfo:[rows=4, cols=2] actions:[AX_FOCUS] bundle:[chromeRole="table", roleDescription="table"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"Sum" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++++View text:"Subtraction" CollectionItemInfo:[heading, rowIndex=0, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="columnHeader", roleDescription="column header"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"10" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"7" CollectionItemInfo:[rowIndex=1, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"2" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"4" CollectionItemInfo:[rowIndex=2, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++View actions:[AX_FOCUS] bundle:[chromeRole="row"] -++++++View text:"12" CollectionItemInfo:[rowIndex=3, rowSpan=1, colIndex=0, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] -++++++View text:"3" CollectionItemInfo:[rowIndex=3, rowSpan=1, colIndex=1, colSpan=1] actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="cell"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/text-align-expected-android-external.txt b/content/test/data/accessibility/html/text-align-expected-android-external.txt deleted file mode 100644 index 732e34f655b7d5..00000000000000 --- a/content/test/data/accessibility/html/text-align-expected-android-external.txt +++ /dev/null @@ -1,12 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Left-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Right-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Centered text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Justified text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Webkit left-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Webkit right-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Webkit centered text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Start-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"End-aligned text" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"No text alignment specified" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Invalid text alignment" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/text-indent-expected-android-external.txt b/content/test/data/accessibility/html/text-indent-expected-android-external.txt deleted file mode 100644 index aff17c84dfdcfa..00000000000000 --- a/content/test/data/accessibility/html/text-indent-expected-android-external.txt +++ /dev/null @@ -1,8 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Text indent 50px" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Text indent -50px" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Text indent 0px" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Text indent initial" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Text indent inherit" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"No text indent specified" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] -++TextView text:"Invalid text indent" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/textarea-expected-android-external.txt b/content/test/data/accessibility/html/textarea-expected-android-external.txt deleted file mode 100644 index 77ffa1c1513bf9..00000000000000 --- a/content/test/data/accessibility/html/textarea-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"The \ntextarea tag defines a multi-line text input control.\n" clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/textarea-read-only-expected-android-external.txt b/content/test/data/accessibility/html/textarea-read-only-expected-android-external.txt deleted file mode 100644 index 0bf0b960e5bd15..00000000000000 --- a/content/test/data/accessibility/html/textarea-read-only-expected-android-external.txt +++ /dev/null @@ -1,3 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++EditText text:"The textarea tag defines a multi-line text input control.\n" clickable editable disabled focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/time-expected-android-external.txt b/content/test/data/accessibility/html/time-expected-android-external.txt deleted file mode 100644 index 3d58de373eb7ef..00000000000000 --- a/content/test/data/accessibility/html/time-expected-android-external.txt +++ /dev/null @@ -1,5 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++View actions:[AX_FOCUS] bundle:[chromeRole="genericContainer"] -++++View text:"10:00" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="time"] -++++TextView text:" " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View text:"Valentines day" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="time"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/ul-contenteditable-expected-android-external.txt b/content/test/data/accessibility/html/ul-contenteditable-expected-android-external.txt deleted file mode 100644 index 3c5c608e06003a..00000000000000 --- a/content/test/data/accessibility/html/ul-contenteditable-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++EditText text:"Hello\n\nBye" clickable editable focusable multiLine textSelectionStart:0 textSelectionEnd:0 actions:[FOCUS, CLICK, AX_FOCUS, NEXT, PREVIOUS, COPY, PASTE, CUT, SET_SELECTION, SET_TEXT, IME_ENTER] bundle:[chromeRole="textField", clickableScore="300"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/ul-expected-android-external.txt b/content/test/data/accessibility/html/ul-expected-android-external.txt deleted file mode 100644 index bd202b4fdaf452..00000000000000 --- a/content/test/data/accessibility/html/ul-expected-android-external.txt +++ /dev/null @@ -1,11 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++ListView CollectionInfo:[rows=3, cols=0] actions:[AX_FOCUS] bundle:[chromeRole="list"] -++++View CollectionItemInfo:[rowIndex=0, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 1" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=1, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 2" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] -++++View CollectionItemInfo:[rowIndex=2, rowSpan=0, colIndex=0, colSpan=0] actions:[AX_FOCUS] bundle:[chromeRole="listItem"] -++++++View text:"• " actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="listMarker"] -++++++TextView text:"Item 3" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="staticText"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/var-expected-android-external.txt b/content/test/data/accessibility/html/var-expected-android-external.txt deleted file mode 100644 index eaff036eca24bd..00000000000000 --- a/content/test/data/accessibility/html/var-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Variable" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/content/test/data/accessibility/html/wbr-expected-android-external.txt b/content/test/data/accessibility/html/wbr-expected-android-external.txt deleted file mode 100644 index d4efedad1c6a73..00000000000000 --- a/content/test/data/accessibility/html/wbr-expected-android-external.txt +++ /dev/null @@ -1,2 +0,0 @@ -WebView focusable focused scrollable actions:[CLEAR_FOCUS, AX_FOCUS] bundle:[chromeRole="rootWebArea"] -++TextView text:"Supercalifragilisticexpialidocious" actions:[AX_FOCUS, NEXT, PREVIOUS] bundle:[chromeRole="genericContainer"] \ No newline at end of file diff --git a/gpu/config/gpu_info_collector_mac.mm b/gpu/config/gpu_info_collector_mac.mm index fc58409f497326..37dada864036de 100644 --- a/gpu/config/gpu_info_collector_mac.mm +++ b/gpu/config/gpu_info_collector_mac.mm @@ -4,12 +4,46 @@ #include "gpu/config/gpu_info_collector.h" +#include "base/mac/scoped_nsobject.h" +#include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "gpu/command_buffer/common/gpu_memory_buffer_support.h" #include "third_party/angle/src/gpu_info_util/SystemInfo.h" +#import + namespace gpu { +namespace { + +// The enums is used for an UMA histogram so we should never reorder entries or +// remove unused values. +enum class MetalReadWriteTextureSupportTier { + kUnknown = 0, + kTier0_NoSupport = 1, + kTier1_R32Formats = 2, + kTier2_AdditionalFormats = 3, + kMaxValue = kTier2_AdditionalFormats, +}; + +void RecordReadWriteMetalTexturesSupportedHistogram() { + // Metal tiers go 0, 1, 2, but we reserve 0 for when macOS is less then 10.13 + // and we can't query. + NSUInteger best_tier = 0; + + if (@available(macOS 10.13, *)) { + base::scoped_nsobject>> devices(MTLCopyAllDevices()); + for (id device in devices.get()) { + best_tier = std::max(best_tier, [device readWriteTextureSupport] + 1); + } + } + + UMA_HISTOGRAM_ENUMERATION( + "Gpu.Metal.ReadWriteTextureSupport", + static_cast(best_tier)); +} +} + bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); @@ -18,6 +52,8 @@ bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { gpu_info->macos_specific_texture_target = gpu::GetPlatformSpecificTextureTarget(); + RecordReadWriteMetalTexturesSupportedHistogram(); + return CollectGraphicsInfoGL(gpu_info); } diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index 5ad54662e4da5e..d8160714666e2e 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg @@ -27446,12 +27446,12 @@ buckets { ' "sdk_package_name": "system-images;android-31;google_apis_playstore;x86_64"' ' },' ' {' - ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-Sv2/google_apis/x86_64.yaml",' - ' "sdk_package_name": "system-images;android-Sv2;google_apis;x86_64"' + ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml",' + ' "sdk_package_name": "system-images;android-32;google_apis;x86_64"' ' },' ' {' - ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-Sv2/google_apis_playstore/x86_64.yaml",' - ' "sdk_package_name": "system-images;android-Sv2;google_apis_playstore;x86_64"' + ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml",' + ' "sdk_package_name": "system-images;android-32;google_apis_playstore;x86_64"' ' }' ' ],' ' "recipe": "android/sdk_packager"' diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star index 6a9cb0e7e0913a..9f4ba0d2e56fd8 100644 --- a/infra/config/subprojects/chromium/ci.star +++ b/infra/config/subprojects/chromium/ci.star @@ -2399,15 +2399,13 @@ ci.cipd_builder( "sdk_package_name": "system-images;android-31;google_apis_playstore;x86_64", "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-31/google_apis_playstore/x86_64.yaml", }, - # Preview system images for Android 12L. - # Should be updated once it is fully released. { - "sdk_package_name": "system-images;android-Sv2;google_apis;x86_64", - "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-Sv2/google_apis/x86_64.yaml", + "sdk_package_name": "system-images;android-32;google_apis;x86_64", + "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml", }, { - "sdk_package_name": "system-images;android-Sv2;google_apis_playstore;x86_64", - "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-Sv2/google_apis_playstore/x86_64.yaml", + "sdk_package_name": "system-images;android-32;google_apis_playstore;x86_64", + "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml", }, ], }, diff --git a/ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item.h b/ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item.h index 8d7aba62f9eeae..0bcfbdb8ca766a 100644 --- a/ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item.h +++ b/ios/chrome/browser/ui/table_view/cells/table_view_link_header_footer_item.h @@ -9,10 +9,6 @@ #import "ios/chrome/browser/ui/table_view/cells/table_view_header_footer_item.h" -// TODO(crbug.com/1279452): This really shouldn't be here, but removing it means -// adding it to 20-30 files. Do as a followup CL. -#include "url/gurl.h" - @class CrURL; @class TableViewLinkHeaderFooterView; diff --git a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_mn.xtb b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_mn.xtb index 58a1c076cef75c..84728ab68aa211 100644 --- a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_mn.xtb +++ b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_mn.xtb @@ -9,12 +9,16 @@ Нууц үгийг харуулах Нууц үгийг харуулах Нууц үг +Google-н Нууц үгний менежер Компьютерийн гарыг нуух +Та төхөөрөмж дээрх бусад аппдаа хадгалсан нууц үгийг ашиглах боломжтой. Тэдгээрийг зөвхөн энэ төхөөрөмж дээрх Google-н Нууц үгний менежерт хадгалдаг. +Нууц үгээ илүү хурдан авахын тулд iCloud keychain-н сонголтыг цуцална уу Таны Chrome-н нууц үгнүүдийг бусад аппад ашиглах боломжтой болно. Та үүнийг Тохиргооны аппад хүссэн үедээ унтраах боломжтой. Өмнөх талбар Ашиглах Chrome-д хадгалсан нууц үг алга Солих +Нууц үгийг Google-н Нууц үгний менежерт хадгалдаг бөгөөд та үүнийг дурын төхөөрөмж дээр ашиглах боломжтой. Chrome-н нууц үгийг автоматаар бөглөх Хэрэглэгчийн нэр Тусламж @@ -26,6 +30,7 @@ Chrome-д хадгалсан нууц үгнүүддээ дурын аппаас хандана уу. Автоматаар бөглөх хэсгийг асаах Эхлүүлэхийн тулд зарим нууц үгийг Chrome-д хадгалах буюу эсхүл Google Бүртгэлээрээ нэвтэрнэ үү. +Та төхөөрөмж дээрх бусад аппдаа хадгалсан нууц үгийг ашиглах боломжтой. Тэдгээрийг -д зориулж Google-н Нууц үгний менежерт хадгалдаг. заавал биш Шинэ нууц үг нэмэх Алдаа гарлаа. Дараа дахин оролдоно уу. @@ -53,4 +58,5 @@ хийсэн URL +Зөвхөн энэ төхөөрөмж дээр нууц үгийг Google-н Нууц үгний менежерт хадгалдаг. \ No newline at end of file diff --git a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_th.xtb b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_th.xtb index 8ec111dad5d063..776e3f5666d468 100644 --- a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_th.xtb +++ b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_th.xtb @@ -9,12 +9,16 @@ แสดงรหัสผ่าน แสดงรหัสผ่าน รหัสผ่าน +เครื่องมือจัดการรหัสผ่านของ Google ซ่อนแป้นพิมพ์ +คุณใช้รหัสผ่านที่บันทึกไว้ได้ในแอปอื่นๆ บนอุปกรณ์ โดยจะบันทึกอยู่ในเครื่องมือจัดการรหัสผ่านของ Google ในอุปกรณ์นี้เท่านั้น +ยกเลิกการเลือกพวงกุญแจ iCloud เพื่อดูรหัสผ่านได้เร็วขึ้น รหัสผ่านของ Chrome จะพร้อมให้ใช้งานในแอปอื่นๆ คุณปิดการตั้งค่านี้ในแอปการตั้งค่าได้ทุกเมื่อ ช่องก่อนหน้า ใช้ ไม่มีรหัสผ่านของ Chrome แทนที่ +รหัสผ่านจะบันทึกอยู่ในเครื่องมือจัดการรหัสผ่านของ Google และจะใช้งานในอุปกรณ์ใดก็ได้ ป้อนรหัสผ่านที่บันทึกไว้ใน Chrome โดยอัตโนมัติ ชื่อผู้ใช้ ความช่วยเหลือ @@ -26,6 +30,7 @@ เข้าถึงรหัสผ่านที่คุณบันทึกไว้ใน Chrome จากแอปใดก็ได้ เปิดฟีเจอร์ป้อนข้อความอัตโนมัติ เริ่มต้นด้วยการบันทึกรหัสผ่านใน Chrome หรือลงชื่อเข้าใช้ด้วยบัญชี Google +คุณใช้รหัสผ่านที่บันทึกไว้ได้ในแอปอื่นๆ บนอุปกรณ์ โดยจะบันทึกอยู่ในเครื่องมือจัดการรหัสผ่านของ Google สำหรับ ไม่บังคับ เพิ่มรหัสผ่านใหม่ เกิดข้อผิดพลาด ลองอีกครั้งภายหลัง @@ -53,4 +58,5 @@ เสร็จสิ้น URL สำหรับ +รหัสผ่านจะบันทึกอยู่ในเครื่องมือจัดการรหัสผ่านของ Google ในอุปกรณ์นี้เท่านั้น \ No newline at end of file diff --git a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-HK.xtb b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-HK.xtb index 58f75a39fedf99..5394282ed06b4d 100644 --- a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-HK.xtb +++ b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-HK.xtb @@ -9,12 +9,16 @@ 顯示密碼 顯示密碼 密碼 +Google 密碼管理員 隱藏鍵盤 +你可以在裝置上的其他應用程式使用儲存的密碼。系統只會將密碼儲存至這部裝置上的 Google 密碼管理員。 +如要更快查看密碼,請取消選取 iCloud 鑰匙圈 您的 Chrome 密碼可在其他應用程式使用。您可隨時在「設定」應用程式關閉此功能。 上一個欄位 使用 沒有 Chrome 密碼 取代 +密碼已儲存至 Google 密碼管理員,你可以在任何裝置上使用。 自動填入 Chrome 密碼 使用者名稱 說明 @@ -26,6 +30,7 @@ 從任何應用程式存取您儲存在 Chrome 中的密碼。 開啟自動填入功能 如要開始使用,請在 Chrome 中儲存一些密碼,或登入 Google 帳戶。 +你可以在裝置上的其他應用程式使用儲存的密碼。系統會將密碼儲存至 的 Google 密碼管理員。 選填 新增密碼 發生錯誤,請稍後再試。 @@ -53,4 +58,5 @@ 完成 網址 適用於 +密碼只會儲存至這部裝置上的 Google 密碼管理員。 \ No newline at end of file diff --git a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-TW.xtb b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-TW.xtb index f85ee1dce904fb..858485bcbdc00d 100644 --- a/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-TW.xtb +++ b/ios/chrome/credential_provider_extension/strings/resources/ios_credential_provider_extension_strings_zh-TW.xtb @@ -9,12 +9,16 @@ 顯示密碼 顯示密碼 密碼 +Google 密碼管理員 隱藏鍵盤 +你可以在裝置上的其他應用程式使用儲存的密碼。系統只會將密碼儲存至這部裝置上的 Google 密碼管理員。 +如要更快查看密碼,請取消選取 iCloud 鑰匙圈 你將可在其他應用程式中使用 Chrome 密碼。你隨時可以在「設定」應用程式中停用這項功能。 上一個欄位 使用 沒有任何 Chrome 密碼 取代 +密碼已儲存至 Google 密碼管理員,你可以在任何裝置上使用。 自動填入 Chrome 密碼 使用者名稱 說明 @@ -26,6 +30,7 @@ 從任何應用程式存取你儲存在 Chrome 中的密碼。 啟用自動填入功能 如要開始存取,請將一些密碼儲存在 Chrome 中或使用 Google 帳戶登入。 +你可以在裝置上的其他應用程式使用儲存的密碼。系統會將密碼儲存至 的 Google 密碼管理員。 選填 新增密碼 發生錯誤,請稍後再試。 @@ -53,4 +58,5 @@ 完成 網址 適用於 +密碼只會儲存至這部裝置上的 Google 密碼管理員。 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index c2f56f622bf6fd..3dc06b974c9f3a 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -297c41c630261f0d40fed2270396a76a98f080ee \ No newline at end of file +230498e1951004a66ec73c5102bd96c3963ad541 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index f6094e0837e192..20a11579f7db89 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -b92a2f9f7f4f8c984a70dc3205488b77ca24ee44 \ No newline at end of file +525b829fa0eb212a83831e8553b3fe820c2425a9 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index 2750a10181e3f5..8ca7de3264aa1c 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -a29549704477dc5527c684658758b162dc1cbcef \ No newline at end of file +bed82ffdc8ab7cf2377b832c9c138a61399baef0 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index 5694eb67058aae..d882d3517f820f 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -aa079019bf0c67c7601fd190a998c2dea1a5e6e8 \ No newline at end of file +3b945e58f52a2305fd7180c18af6d7f04f96b887 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 index 7f169b88eeaab2..724c65e47219a6 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -d11f4cd33ecd30b71549ff1af6fd66de5c625f81 \ No newline at end of file +6f2519a2c1467c5e7ed7c1e7f72fecbe0cfa701c \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 index 516c3ba39cac99..e76eecfee93833 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -215645445de4765f7bc1dffeb78e793580db86b6 \ No newline at end of file +300c9f59171763afd68e7a1f7ccfb49037a9a600 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index 697cbc94bfe7b3..07433b03a4d7e4 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -d91416e578ed6b14d741e48b70592a183bf6009a \ No newline at end of file +069af65b116b1a93d73e8f67e2f18a91bb75661a \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index 099f74cabbe129..d578d6964b1655 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -ac8c538c30b1591ab918a9f05a5f286759ff3264 \ No newline at end of file +f8fb430360e82952b5465991b7c1a6cb71e2ac46 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index 94ae1489fe1741..67448979e437e2 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 @@ -1 +1 @@ -209e495ba6c9ba63198a36717fe754fe7ac4cde5 \ No newline at end of file +81598f1241bb5898b76498892fbb638128723031 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index 72fe90904bb981..4274e61ccf1dc6 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 @@ -1 +1 @@ -155c2d35bf123526a32e946fdc3be595daf3d3f0 \ No newline at end of file +d71667f660eda347eb1e22633c43d6bfe45d7ef6 \ No newline at end of file diff --git a/ios/third_party/material_components_ios/BUILD.gn b/ios/third_party/material_components_ios/BUILD.gn index a6821c3808c6a4..17c2164e13d4cb 100644 --- a/ios/third_party/material_components_ios/BUILD.gn +++ b/ios/third_party/material_components_ios/BUILD.gn @@ -53,6 +53,7 @@ _mdc_public_headers = [ "src/components/AppBar/src/private/MaterialAppBarStrings_table.h", "src/components/Availability/src/MDCAvailability.h", "src/components/Availability/src/MaterialAvailability.h", + "src/components/Badges/src/MDCBadgeView.h", "src/components/Banner/src/MDCBannerView.h", "src/components/Banner/src/MaterialBanner.h", "src/components/Banner/src/Theming/MDCBannerView+MaterialTheming.h", @@ -69,7 +70,6 @@ _mdc_public_headers = [ "src/components/BottomNavigation/src/MaterialBottomNavigation.h", "src/components/BottomNavigation/src/PerformantShadowMigration/MDCBottomNavigationBar+ShadowsPrivate.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationBar+Private.h", - "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemView.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationLargeItemDialogView.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationSystemDialogView.h", @@ -572,6 +572,7 @@ _mdc_include_dirs = [ "src/components/AppBar/src/TypographyThemer", "src/components/AppBar/src/private", "src/components/Availability/src", + "src/components/Badges/src", "src/components/Banner/src", "src/components/Banner/src/Theming", "src/components/BottomAppBar/src", @@ -778,6 +779,8 @@ _mdc_sources = [ "src/components/AppBar/src/private/MaterialAppBarStrings_table.h", "src/components/Availability/src/MDCAvailability.h", "src/components/Availability/src/MaterialAvailability.h", + "src/components/Badges/src/MDCBadgeView.h", + "src/components/Badges/src/MDCBadgeView.m", "src/components/Banner/src/MDCBannerView.h", "src/components/Banner/src/MDCBannerView.m", "src/components/Banner/src/MaterialBanner.h", @@ -800,8 +803,6 @@ _mdc_sources = [ "src/components/BottomNavigation/src/MaterialBottomNavigation.h", "src/components/BottomNavigation/src/PerformantShadowMigration/MDCBottomNavigationBar+ShadowsPrivate.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationBar+Private.h", - "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.h", - "src/components/BottomNavigation/src/private/MDCBottomNavigationItemBadge.m", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemView.h", "src/components/BottomNavigation/src/private/MDCBottomNavigationItemView.m", "src/components/BottomNavigation/src/private/MDCBottomNavigationLargeItemDialogView.h", diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc index 602e1fc03c8152..497d535f27884a 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc @@ -463,7 +463,7 @@ typedef BOOL(WINAPI* DuplicateHandleFunctionPtr)(HANDLE source_process_handle, DuplicateHandleFunctionPtr g_iat_orig_duplicate_handle; -NtQueryObjectFunction g_QueryObject = NULL; +NtQueryObject g_QueryObject = NULL; static const char* kDuplicateHandleWarning = "You are attempting to duplicate a privileged handle into a sandboxed" diff --git a/sandbox/win/src/handle_closer.cc b/sandbox/win/src/handle_closer.cc index 56e27d20826308..841a81506b3d7c 100644 --- a/sandbox/win/src/handle_closer.cc +++ b/sandbox/win/src/handle_closer.cc @@ -11,6 +11,10 @@ #include "base/check_op.h" #include "base/memory/free_deleter.h" #include "base/win/windows_version.h" +#include "sandbox/win/src/interceptors.h" +#include "sandbox/win/src/internal_types.h" +#include "sandbox/win/src/nt_internals.h" +#include "sandbox/win/src/process_thread_interception.h" #include "sandbox/win/src/win_utils.h" namespace { @@ -153,4 +157,29 @@ bool HandleCloser::SetupHandleList(void* buffer, size_t buffer_bytes) { return output <= end; } +bool GetHandleName(HANDLE handle, std::wstring* handle_name) { + static NtQueryObject QueryObject = nullptr; + if (!QueryObject) + ResolveNTFunctionPtr("NtQueryObject", &QueryObject); + + ULONG size = MAX_PATH; + std::unique_ptr name; + NTSTATUS result; + + do { + name.reset(static_cast(malloc(size))); + DCHECK(name.get()); + result = + QueryObject(handle, ObjectNameInformation, name.get(), size, &size); + } while (result == STATUS_INFO_LENGTH_MISMATCH || + result == STATUS_BUFFER_OVERFLOW); + + if (NT_SUCCESS(result) && name->Buffer && name->Length) + handle_name->assign(name->Buffer, name->Length / sizeof(wchar_t)); + else + handle_name->clear(); + + return NT_SUCCESS(result); +} + } // namespace sandbox diff --git a/sandbox/win/src/handle_closer.h b/sandbox/win/src/handle_closer.h index ef885dc664ec6f..4bfab94417806a 100644 --- a/sandbox/win/src/handle_closer.h +++ b/sandbox/win/src/handle_closer.h @@ -72,6 +72,9 @@ class HandleCloser { HandleMap handles_to_close_; }; +// Returns the object manager's name associated with a handle +bool GetHandleName(HANDLE handle, std::wstring* handle_name); + } // namespace sandbox #endif // SANDBOX_WIN_SRC_HANDLE_CLOSER_H_ diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/win/src/handle_closer_agent.cc index 0b0de365d12709..045b17ac3972a3 100644 --- a/sandbox/win/src/handle_closer_agent.cc +++ b/sandbox/win/src/handle_closer_agent.cc @@ -6,13 +6,35 @@ #include #include -#include #include "base/check.h" #include "base/win/static_constants.h" -#include "base/win/win_util.h" +#include "sandbox/win/src/nt_internals.h" #include "sandbox/win/src/win_utils.h" +namespace { + +// Returns type infomation for an NT object. This routine is expected to be +// called for invalid handles so it catches STATUS_INVALID_HANDLE exceptions +// that can be generated when handle tracing is enabled. +NTSTATUS QueryObjectTypeInformation(HANDLE handle, void* buffer, ULONG* size) { + static NtQueryObject QueryObject = nullptr; + if (!QueryObject) + ResolveNTFunctionPtr("NtQueryObject", &QueryObject); + + NTSTATUS status = STATUS_UNSUCCESSFUL; + __try { + status = QueryObject(handle, ObjectTypeInformation, buffer, *size, size); + } __except (GetExceptionCode() == STATUS_INVALID_HANDLE + ? EXCEPTION_EXECUTE_HANDLER + : EXCEPTION_CONTINUE_SEARCH) { + status = STATUS_INVALID_HANDLE; + } + return status; +} + +} // namespace + namespace sandbox { // Memory buffer mapped from the parent, with the list of handles. @@ -155,44 +177,60 @@ bool HandleCloserAgent::CloseHandles() { if (GetModuleHandleA(base::win::kApplicationVerifierDllName)) return true; - uint32_t handle_value = 0; + // Set up buffers for the type info and the name. + std::vector type_info_buffer(sizeof(OBJECT_TYPE_INFORMATION) + + 32 * sizeof(wchar_t)); + OBJECT_TYPE_INFORMATION* type_info = + reinterpret_cast(&(type_info_buffer[0])); + std::wstring handle_name; + HANDLE handle = nullptr; int invalid_count = 0; // Keep incrementing until we hit the number of handles reported by // GetProcessHandleCount(). If we hit a very long sequence of invalid // handles we assume that we've run past the end of the table. while (handle_count && invalid_count < kInvalidHandleThreshold) { - handle_value += kHandleOffset; - HANDLE handle = base::win::Uint32ToHandle(handle_value); - std::wstring type_name; - if (!GetTypeNameFromHandle(handle, &type_name)) { + reinterpret_cast(handle) += kHandleOffset; + NTSTATUS rc; + + // Get the type name, reusing the buffer. + ULONG size = static_cast(type_info_buffer.size()); + rc = QueryObjectTypeInformation(handle, type_info, &size); + while (rc == STATUS_INFO_LENGTH_MISMATCH || rc == STATUS_BUFFER_OVERFLOW) { + type_info_buffer.resize(size + sizeof(wchar_t)); + type_info = + reinterpret_cast(&(type_info_buffer[0])); + rc = QueryObjectTypeInformation(handle, type_info, &size); + // Leave padding for the nul terminator. + if (NT_SUCCESS(rc) && size == type_info_buffer.size()) + rc = STATUS_INFO_LENGTH_MISMATCH; + } + if (!NT_SUCCESS(rc) || !type_info->Name.Buffer) { ++invalid_count; continue; } --handle_count; - // Check if we're looking for this type of handle. - HandleMap::iterator result = handles_to_close_.find(type_name); - if (result == handles_to_close_.end()) - continue; + type_info->Name.Buffer[type_info->Name.Length / sizeof(wchar_t)] = L'\0'; - HandleMap::mapped_type& names = result->second; - // Empty set means close all handles of this type; otherwise check name. - if (!names.empty()) { - std::wstring handle_name; - // Move on to the next handle if this name doesn't match. - if (!GetPathFromHandle(handle, &handle_name) || - !names.count(handle_name)) { - continue; + // Check if we're looking for this type of handle. + HandleMap::iterator result = handles_to_close_.find(type_info->Name.Buffer); + if (result != handles_to_close_.end()) { + HandleMap::mapped_type& names = result->second; + // Empty set means close all handles of this type; otherwise check name. + if (!names.empty()) { + // Move on to the next handle if this name doesn't match. + if (!GetHandleName(handle, &handle_name) || !names.count(handle_name)) + continue; } - } - if (!::SetHandleInformation(handle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0)) - return false; - if (!::CloseHandle(handle)) - return false; - // Attempt to stuff this handle with a new dummy Event. - AttemptToStuffHandleSlot(handle, result->first); + if (!::SetHandleInformation(handle, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0)) + return false; + if (!::CloseHandle(handle)) + return false; + // Attempt to stuff this handle with a new dummy Event. + AttemptToStuffHandleSlot(handle, result->first); + } } return true; diff --git a/sandbox/win/src/handle_closer_test.cc b/sandbox/win/src/handle_closer_test.cc index abfb21ca88f433..7406f77592a944 100644 --- a/sandbox/win/src/handle_closer_test.cc +++ b/sandbox/win/src/handle_closer_test.cc @@ -5,7 +5,6 @@ #include #include -#include "base/strings/string_util_win.h" #include "base/strings/stringprintf.h" #include "base/win/scoped_handle.h" #include "sandbox/win/src/handle_closer_agent.h" @@ -13,7 +12,6 @@ #include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox_factory.h" #include "sandbox/win/src/target_services.h" -#include "sandbox/win/src/win_utils.h" #include "sandbox/win/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" @@ -47,6 +45,25 @@ HANDLE GetMarkerFile(const wchar_t* extension) { nullptr, OPEN_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, nullptr); } +// Returns type infomation for an NT object. This routine is expected to be +// called for invalid handles so it catches STATUS_INVALID_HANDLE exceptions +// that can be generated when handle tracing is enabled. +NTSTATUS QueryObjectTypeInformation(HANDLE handle, void* buffer, ULONG* size) { + static NtQueryObject QueryObject = nullptr; + if (!QueryObject) + ResolveNTFunctionPtr("NtQueryObject", &QueryObject); + + NTSTATUS status = STATUS_UNSUCCESSFUL; + __try { + status = QueryObject(handle, ObjectTypeInformation, buffer, *size, size); + } __except (GetExceptionCode() == STATUS_INVALID_HANDLE + ? EXCEPTION_EXECUTE_HANDLER + : EXCEPTION_CONTINUE_SEARCH) { + status = STATUS_INVALID_HANDLE; + } + return status; +} + // Used by the thread pool tests. HANDLE finish_event; const int kWaitCount = 20; @@ -88,7 +105,7 @@ SBOX_TESTS_COMMAND int CheckForFileHandles(int argc, wchar_t** argv) { while (handle_count && invalid_count < kInvalidHandleThreshold) { reinterpret_cast(handle) += kHandleOffset; - if (GetPathFromHandle(handle, &handle_name)) { + if (GetHandleName(handle, &handle_name)) { for (int i = 1; i < argc; ++i) { if (handle_name == argv[i]) return should_find ? SBOX_TEST_SUCCEEDED : SBOX_TEST_FAILED; @@ -127,9 +144,36 @@ SBOX_TESTS_COMMAND int CheckForEventHandles(int argc, wchar_t** argv) { case AFTER_REVERT: for (HANDLE handle : to_check) { - std::wstring type_name; - CHECK(GetTypeNameFromHandle(handle, &type_name)); - CHECK(base::EqualsCaseInsensitiveASCII(type_name, L"Event")); + // Set up buffers for the type info and the name. + std::vector type_info_buffer(sizeof(OBJECT_TYPE_INFORMATION) + + 32 * sizeof(wchar_t)); + OBJECT_TYPE_INFORMATION* type_info = + reinterpret_cast(&(type_info_buffer[0])); + NTSTATUS rc; + + // Get the type name, reusing the buffer. + ULONG size = static_cast(type_info_buffer.size()); + rc = QueryObjectTypeInformation(handle, type_info, &size); + while (rc == STATUS_INFO_LENGTH_MISMATCH || + rc == STATUS_BUFFER_OVERFLOW) { + type_info_buffer.resize(size + sizeof(wchar_t)); + type_info = reinterpret_cast( + &(type_info_buffer[0])); + rc = QueryObjectTypeInformation(handle, type_info, &size); + // Leave padding for the nul terminator. + if (NT_SUCCESS(rc) && size == type_info_buffer.size()) + rc = STATUS_INFO_LENGTH_MISMATCH; + } + + CHECK(NT_SUCCESS(rc)); + CHECK(type_info->Name.Buffer); + + type_info->Name.Buffer[type_info->Name.Length / sizeof(wchar_t)] = + L'\0'; + + // Should be an Event now. + CHECK_EQ(wcslen(type_info->Name.Buffer), 5U); + CHECK_EQ(wcscmp(L"Event", type_info->Name.Buffer), 0); // Should not be able to wait. CHECK_EQ(WaitForSingleObject(handle, INFINITE), WAIT_FAILED); @@ -156,7 +200,7 @@ TEST(HandleCloserTest, CheckForMarkerFiles) { std::wstring handle_name; base::win::ScopedHandle marker(GetMarkerFile(kExtension)); CHECK(marker.IsValid()); - CHECK(GetPathFromHandle(marker.Get(), &handle_name)); + CHECK(sandbox::GetHandleName(marker.Get(), &handle_name)); command += (L" "); command += handle_name; } @@ -176,7 +220,7 @@ TEST(HandleCloserTest, CloseMarkerFiles) { std::wstring handle_name; base::win::ScopedHandle marker(GetMarkerFile(kExtension)); CHECK(marker.IsValid()); - CHECK(GetPathFromHandle(marker.Get(), &handle_name)); + CHECK(sandbox::GetHandleName(marker.Get(), &handle_name)); CHECK_EQ(policy->AddKernelObjectToClose(L"File", handle_name.c_str()), SBOX_ALL_OK); command += (L" "); @@ -197,7 +241,7 @@ TEST(HandleCloserTest, CheckStuffedHandle) { std::wstring handle_name; base::win::ScopedHandle marker(GetMarkerFile(kExtension)); CHECK(marker.IsValid()); - CHECK(GetPathFromHandle(marker.Get(), &handle_name)); + CHECK(sandbox::GetHandleName(marker.Get(), &handle_name)); CHECK_EQ(policy->AddKernelObjectToClose(L"File", handle_name.c_str()), SBOX_ALL_OK); } diff --git a/sandbox/win/src/named_pipe_policy_test.cc b/sandbox/win/src/named_pipe_policy_test.cc index 3d8db97a99ebca..db532d618d6d2d 100644 --- a/sandbox/win/src/named_pipe_policy_test.cc +++ b/sandbox/win/src/named_pipe_policy_test.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/win/windows_version.h" +#include "sandbox/win/src/handle_closer.h" #include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox_factory.h" #include "sandbox/win/src/sandbox_policy.h" -#include "sandbox/win/src/win_utils.h" #include "sandbox/win/tests/common/controller.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +26,7 @@ SBOX_TESTS_COMMAND int NamedPipe_Create(int argc, wchar_t** argv) { // pipe should be in the object namespace after creation. if (argc == 2) { std::wstring handle_name; - if (GetPathFromHandle(pipe, &handle_name)) { + if (GetHandleName(pipe, &handle_name)) { if (handle_name.compare(0, wcslen(argv[1]), argv[1]) != 0) return SBOX_TEST_FAILED; } else { diff --git a/sandbox/win/src/nt_internals.h b/sandbox/win/src/nt_internals.h index 79784aa7d69bf4..46d489fe2c506b 100644 --- a/sandbox/win/src/nt_internals.h +++ b/sandbox/win/src/nt_internals.h @@ -723,6 +723,13 @@ typedef NTSTATUS(WINAPI* NtQuerySystemInformation)( IN ULONG SystemInformationLength, OUT PULONG ReturnLength); +typedef NTSTATUS(WINAPI* NtQueryObject)(IN HANDLE Handle, + IN OBJECT_INFORMATION_CLASS + ObjectInformationClass, + OUT PVOID ObjectInformation, + IN ULONG ObjectInformationLength, + OUT PULONG ReturnLength); + // ----------------------------------------------------------------------- // Strings diff --git a/sandbox/win/src/sandbox_nt_util.cc b/sandbox/win/src/sandbox_nt_util.cc index 84b5bb67ed9066..8ba59ff7bf99c0 100644 --- a/sandbox/win/src/sandbox_nt_util.cc +++ b/sandbox/win/src/sandbox_nt_util.cc @@ -230,6 +230,70 @@ NTSTATUS CopyData(void* destination, const void* source, size_t bytes) { return ret; } +NTSTATUS AllocAndGetFullPath( + HANDLE root, + const wchar_t* path, + std::unique_ptr* full_path) { + if (!InitHeap()) + return STATUS_NO_MEMORY; + + DCHECK_NT(full_path); + DCHECK_NT(path); + NTSTATUS ret = STATUS_UNSUCCESSFUL; + __try { + do { + static NtQueryObjectFunction NtQueryObject = nullptr; + if (!NtQueryObject) + ResolveNTFunctionPtr("NtQueryObject", &NtQueryObject); + + ULONG size = 0; + // Query the name information a first time to get the size of the name. + ret = NtQueryObject(root, ObjectNameInformation, nullptr, 0, &size); + + std::unique_ptr handle_name; + if (size) { + handle_name.reset(reinterpret_cast( + new (NT_ALLOC) BYTE[size])); + + // Query the name information a second time to get the name of the + // object referenced by the handle. + ret = NtQueryObject(root, ObjectNameInformation, handle_name.get(), + size, &size); + } + + if (STATUS_SUCCESS != ret) + break; + + // Space for path + '\' + name + '\0'. + size_t name_length = + handle_name->ObjectName.Length + (wcslen(path) + 2) * sizeof(wchar_t); + full_path->reset(new (NT_ALLOC) wchar_t[name_length / sizeof(wchar_t)]); + if (!*full_path) + break; + wchar_t* off = full_path->get(); + ret = CopyData(off, handle_name->ObjectName.Buffer, + handle_name->ObjectName.Length); + if (!NT_SUCCESS(ret)) + break; + off += handle_name->ObjectName.Length / sizeof(wchar_t); + *off = L'\\'; + off += 1; + ret = CopyData(off, path, wcslen(path) * sizeof(wchar_t)); + if (!NT_SUCCESS(ret)) + break; + off += wcslen(path); + *off = L'\0'; + } while (false); + } __except (EXCEPTION_EXECUTE_HANDLER) { + ret = GetExceptionCode(); + } + + if (!NT_SUCCESS(ret) && *full_path) + full_path->reset(nullptr); + + return ret; +} + // Hacky code... replace with AllocAndCopyObjectAttributes. NTSTATUS AllocAndCopyName(const OBJECT_ATTRIBUTES* in_object, std::unique_ptr* out_name, diff --git a/sandbox/win/src/sandbox_nt_util.h b/sandbox/win/src/sandbox_nt_util.h index 2eddc3f46fc1e5..f7a91d8eefae83 100644 --- a/sandbox/win/src/sandbox_nt_util.h +++ b/sandbox/win/src/sandbox_nt_util.h @@ -117,6 +117,12 @@ NTSTATUS AllocAndCopyName(const OBJECT_ATTRIBUTES* in_object, uint32_t* attributes, HANDLE* root); +// Determine full path name from object root and path. +NTSTATUS AllocAndGetFullPath( + HANDLE root, + const wchar_t* path, + std::unique_ptr* full_path); + // Initializes our ntdll level heap bool InitHeap(); diff --git a/sandbox/win/src/win_utils.cc b/sandbox/win/src/win_utils.cc index 5469e634a2c52a..c8d0702652e912 100644 --- a/sandbox/win/src/win_utils.cc +++ b/sandbox/win/src/win_utils.cc @@ -147,31 +147,6 @@ void RemoveImpliedDevice(std::wstring* path) { *path = path->substr(kNTDotPrefixLen); } -bool QueryObjectInformation(HANDLE handle, - OBJECT_INFORMATION_CLASS info_class, - DWORD initial_size, - std::vector* buffer) { - static NtQueryObjectFunction NtQueryObject = nullptr; - if (!NtQueryObject) - ResolveNTFunctionPtr("NtQueryObject", &NtQueryObject); - - ULONG size = initial_size; - NTSTATUS status = STATUS_BUFFER_OVERFLOW; - __try { - do { - buffer->resize(size); - status = NtQueryObject(handle, info_class, buffer->data(), size, &size); - } while (status == STATUS_INFO_LENGTH_MISMATCH || - status == STATUS_BUFFER_OVERFLOW); - } __except (GetExceptionCode() == STATUS_INVALID_HANDLE - ? EXCEPTION_EXECUTE_HANDLER - : EXCEPTION_CONTINUE_SEARCH) { - status = STATUS_INVALID_HANDLE; - } - - return NT_SUCCESS(status); -} - } // namespace namespace sandbox { @@ -436,13 +411,30 @@ bool ConvertToLongPath(std::wstring* native_path, } bool GetPathFromHandle(HANDLE handle, std::wstring* path) { - std::vector buffer; - if (!QueryObjectInformation(handle, ObjectNameInformation, - sizeof(OBJECT_NAME_INFORMATION), &buffer)) { - return false; + NtQueryObjectFunction NtQueryObject = nullptr; + ResolveNTFunctionPtr("NtQueryObject", &NtQueryObject); + + OBJECT_NAME_INFORMATION initial_buffer; + OBJECT_NAME_INFORMATION* name = &initial_buffer; + ULONG size = sizeof(initial_buffer); + // Query the name information a first time to get the size of the name. + // Windows XP requires that the size of the buffer passed in here be != 0. + NTSTATUS status = + NtQueryObject(handle, ObjectNameInformation, name, size, &size); + + std::unique_ptr name_ptr; + if (size) { + name_ptr.reset(new BYTE[size]); + name = reinterpret_cast(name_ptr.get()); + + // Query the name information a second time to get the name of the + // object referenced by the handle. + status = NtQueryObject(handle, ObjectNameInformation, name, size, &size); } - OBJECT_NAME_INFORMATION* name = - reinterpret_cast(buffer.data()); + + if (STATUS_SUCCESS != status) + return false; + path->assign(name->ObjectName.Buffer, name->ObjectName.Length / sizeof(name->ObjectName.Buffer[0])); return true; @@ -459,19 +451,6 @@ bool GetNtPathFromWin32Path(const std::wstring& path, std::wstring* nt_path) { return rv; } -bool GetTypeNameFromHandle(HANDLE handle, std::wstring* type_name) { - std::vector buffer; - if (!QueryObjectInformation(handle, ObjectTypeInformation, - sizeof(OBJECT_TYPE_INFORMATION), &buffer)) { - return false; - } - OBJECT_TYPE_INFORMATION* name = - reinterpret_cast(buffer.data()); - type_name->assign(name->Name.Buffer, - name->Name.Length / sizeof(name->Name.Buffer[0])); - return true; -} - bool WriteProtectedChildMemory(HANDLE child_process, void* address, const void* buffer, diff --git a/sandbox/win/src/win_utils.h b/sandbox/win/src/win_utils.h index ce96c0f19ae361..6f54d200499a97 100644 --- a/sandbox/win/src/win_utils.h +++ b/sandbox/win/src/win_utils.h @@ -69,12 +69,9 @@ bool SameObject(HANDLE handle, const wchar_t* full_path); bool GetPathFromHandle(HANDLE handle, std::wstring* path); // Resolves a win32 path to an nt path using GetPathFromHandle. The path must -// exist. Returns true if the translation was successful. +// exist. Returs true if the translation was succesful. bool GetNtPathFromWin32Path(const std::wstring& path, std::wstring* nt_path); -// Resolves a handle to its type name. Returns true if successful. -bool GetTypeNameFromHandle(HANDLE handle, std::wstring* type_name); - // Translates a reserved key name to its handle. // For example "HKEY_LOCAL_MACHINE" returns HKEY_LOCAL_MACHINE. // Returns nullptr if the name does not represent any reserved key name. diff --git a/sandbox/win/src/win_utils_unittest.cc b/sandbox/win/src/win_utils_unittest.cc index a84db938fb8b5a..b81721c2887cd6 100644 --- a/sandbox/win/src/win_utils_unittest.cc +++ b/sandbox/win/src/win_utils_unittest.cc @@ -15,9 +15,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h" -#include "base/rand_util.h" -#include "base/strings/string_util_win.h" -#include "base/strings/stringprintf.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" #include "sandbox/win/src/nt_internals.h" @@ -61,25 +58,6 @@ bool GetModuleList(HANDLE process, std::vector* result) { return false; } -std::wstring GetRandomName() { - return base::StringPrintf(L"chrome_%08X%08X", base::RandUint64(), - base::RandUint64()); -} - -void CompareHandlePath(const base::win::ScopedHandle& handle, - const std::wstring& expected_path) { - std::wstring path; - ASSERT_TRUE(GetPathFromHandle(handle.Get(), &path)); - EXPECT_TRUE(base::EqualsCaseInsensitiveASCII(path, expected_path)); -} - -void CompareHandleType(const base::win::ScopedHandle& handle, - const std::wstring& expected_type) { - std::wstring type_name; - ASSERT_TRUE(GetTypeNameFromHandle(handle.Get(), &type_name)); - EXPECT_TRUE(base::EqualsCaseInsensitiveASCII(type_name, expected_type)); -} - } // namespace TEST(WinUtils, IsReparsePoint) { @@ -273,27 +251,4 @@ TEST(WinUtils, ConvertToLongPath) { // Expected result: "\Device\HarddiskVolumeX\ProgramData\%TEMP%\test_calc.exe" } -TEST(WinUtils, GetPathAndTypeFromHandle) { - std::wstring invalid_handle; - EXPECT_FALSE(GetPathFromHandle(nullptr, &invalid_handle)); - EXPECT_TRUE(invalid_handle.empty()); - EXPECT_FALSE(GetTypeNameFromHandle(nullptr, &invalid_handle)); - EXPECT_TRUE(invalid_handle.empty()); - std::wstring random_name = GetRandomName(); - ASSERT_FALSE(random_name.empty()); - std::wstring event_name = L"Global\\" + random_name; - base::win::ScopedHandle event_handle( - ::CreateEvent(nullptr, FALSE, FALSE, event_name.c_str())); - ASSERT_TRUE(event_handle.IsValid()); - CompareHandlePath(event_handle, L"\\BaseNamedObjects\\" + random_name); - CompareHandleType(event_handle, L"Event"); - std::wstring pipe_name = L"\\\\.\\pipe\\" + random_name; - base::win::ScopedHandle pipe_handle(::CreateNamedPipe( - pipe_name.c_str(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE, - PIPE_UNLIMITED_INSTANCES, 0, 0, NMPWAIT_USE_DEFAULT_WAIT, nullptr)); - ASSERT_TRUE(pipe_handle.IsValid()); - CompareHandlePath(pipe_handle, L"\\Device\\NamedPipe\\" + random_name); - CompareHandleType(pipe_handle, L"File"); -} - } // namespace sandbox diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn index 029724d68f653a..ad62a459f37e6a 100644 --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn @@ -1237,7 +1237,7 @@ if (!limit_android_deps) { # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. android_aar_prebuilt("com_google_android_material_material_java") { aar_path = - "libs/com_google_android_material_material/material-1.5.0-alpha05.aar" + "libs/com_google_android_material_material/material-1.6.0-alpha01.aar" info_path = "libs/com_google_android_material_material/com_google_android_material_material.info" # Material Design is pulled in via Doubledown, thus this target should not diff --git a/third_party/android_deps/libs/com_google_android_material_material/README.chromium b/third_party/android_deps/libs/com_google_android_material_material/README.chromium index e3e8b71fda1408..2074f38115ecd0 100644 --- a/third_party/android_deps/libs/com_google_android_material_material/README.chromium +++ b/third_party/android_deps/libs/com_google_android_material_material/README.chromium @@ -1,7 +1,7 @@ Name: Material Components for Android Short Name: material URL: https://github.com/material-components/material-components-android -Version: 1.5.0-alpha05 +Version: 1.6.0-alpha01 License: Android Software Development Kit License License File: LICENSE Security Critical: yes diff --git a/third_party/android_deps/libs/com_google_android_material_material/cipd.yaml b/third_party/android_deps/libs/com_google_android_material_material/cipd.yaml index 11223fcfe3f01c..c8674265f39638 100644 --- a/third_party/android_deps/libs/com_google_android_material_material/cipd.yaml +++ b/third_party/android_deps/libs/com_google_android_material_material/cipd.yaml @@ -3,8 +3,8 @@ # found in the LICENSE file. # To create CIPD package run the following command. -# cipd create --pkg-def cipd.yaml -tag version:2@1.5.0-alpha05.cr0 +# cipd create --pkg-def cipd.yaml -tag version:2@1.6.0-alpha01.cr0 package: chromium/third_party/android_deps/libs/com_google_android_material_material description: "Material Components for Android" data: -- file: material-1.5.0-alpha05.aar +- file: material-1.6.0-alpha01.aar diff --git a/third_party/android_deps/libs/com_google_android_material_material/com_google_android_material_material.info b/third_party/android_deps/libs/com_google_android_material_material/com_google_android_material_material.info index 07b2585ec84fcd..19ee4dfd1995f5 100644 --- a/third_party/android_deps/libs/com_google_android_material_material/com_google_android_material_material.info +++ b/third_party/android_deps/libs/com_google_android_material_material/com_google_android_material_material.info @@ -28,9 +28,11 @@ resources = [ "res/animator/linear_indeterminate_line2_head_interpolator.xml", "res/animator/linear_indeterminate_line2_tail_interpolator.xml", "res/animator/m3_btn_elevated_btn_state_list_anim.xml", + "res/animator/m3_btn_state_list_anim.xml", "res/animator/m3_card_elevated_state_list_anim.xml", "res/animator/m3_card_state_list_anim.xml", "res/animator/m3_chip_state_list_anim.xml", + "res/animator/m3_elevated_chip_state_list_anim.xml", "res/animator/mtrl_btn_state_list_anim.xml", "res/animator/mtrl_btn_unelevated_state_list_anim.xml", "res/animator/mtrl_card_state_list_anim.xml", @@ -50,6 +52,7 @@ resources = [ "res/color/design_error.xml", "res/color/design_icon_tint.xml", "res/color/m3_appbar_overlay_color.xml", + "res/color/m3_assist_chip_icon_tint_color.xml", "res/color/m3_assist_chip_stroke_color.xml", "res/color/m3_button_background_color_selector.xml", "res/color/m3_button_foreground_color_selector.xml", @@ -207,6 +210,7 @@ resources = [ "res/drawable/ic_keyboard_black_24dp.xml", "res/drawable/ic_m3_chip_check.xml", "res/drawable/ic_m3_chip_checked_circle.xml", + "res/drawable/ic_m3_chip_close.xml", "res/drawable/ic_mtrl_checked_circle.xml", "res/drawable/ic_mtrl_chip_checked_black.xml", "res/drawable/ic_mtrl_chip_checked_circle.xml", diff --git a/third_party/android_sdk/cipd/system_images/android-Sv2/google_apis/x86_64.yaml b/third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml similarity index 64% rename from third_party/android_sdk/cipd/system_images/android-Sv2/google_apis/x86_64.yaml rename to third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml index 0f29bd0e234ad7..5e8f6637adf9bb 100644 --- a/third_party/android_sdk/cipd/system_images/android-Sv2/google_apis/x86_64.yaml +++ b/third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -package: chromium/third_party/android_sdk/public/system-images/android-sv2/google_apis/x86_64 -description: system_images;android-Sv2;google_apis;x86_64 +package: chromium/third_party/android_sdk/public/system-images/android-32/google_apis/x86_64 +description: system_images;android-32;google_apis;x86_64 root: ../../../../public/ data: - - dir: system-images/android-Sv2/google_apis/x86_64 + - dir: system-images/android-32/google_apis/x86_64 diff --git a/third_party/android_sdk/cipd/system_images/android-Sv2/google_apis_playstore/x86_64.yaml b/third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml similarity index 60% rename from third_party/android_sdk/cipd/system_images/android-Sv2/google_apis_playstore/x86_64.yaml rename to third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml index a19de82a238006..d5d37314430ed6 100644 --- a/third_party/android_sdk/cipd/system_images/android-Sv2/google_apis_playstore/x86_64.yaml +++ b/third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -package: chromium/third_party/android_sdk/public/system-images/android-sv2/google_apis_playstore/x86_64 -description: system_images;android-Sv2;google_apis_playstore;x86_64 +package: chromium/third_party/android_sdk/public/system-images/android-32/google_apis_playstore/x86_64 +description: system_images;android-32;google_apis_playstore;x86_64 root: ../../../../public/ data: - - dir: system-images/android-Sv2/google_apis_playstore/x86_64 + - dir: system-images/android-32/google_apis_playstore/x86_64 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc index db6009b0670b8c..ca187e793302c3 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc @@ -1070,6 +1070,9 @@ const base::FeatureParam kCostReductionOfMultiplexedRequests{ const base::Feature kForceMajorVersion100InUserAgent{ "ForceMajorVersion100InUserAgent", base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kForceMinorVersion100InUserAgent{ + "ForceMinorVersion100InUserAgent", base::FEATURE_DISABLED_BY_DEFAULT}; + // Enable `sec-ch-device-memory` client hint. const base::Feature kClientHintsDeviceMemory{"ClientHintsDeviceMemory", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h index 2a792a01cdd5f3..974d9a9dc3aace 100644 --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h @@ -495,6 +495,13 @@ extern const base::FeatureParam kHttpRttThreshold; BLINK_COMMON_EXPORT extern const base::FeatureParam kCostReductionOfMultiplexedRequests; +// If enabled, the minor version number returned by Chrome will be forced to +// 100. This feature is only applicable for M96-M99 and will be removed after +// M99. The purpose of this feature is to allow testing of mitigation +// strategies for conveying the major version number in the minor version string +// if we decide to freeze the major version at 99. +BLINK_COMMON_EXPORT extern const base::Feature kForceMinorVersion100InUserAgent; + // If enabled, the major version number returned by Chrome will be forced to // 100. This feature is only applicable for M96-M99 and will be removed after // M99. The purpose of this feature is to allow users to test and proactively diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc index 397f48e09a487d..3c01114e888240 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc @@ -417,8 +417,8 @@ bool CalculateStyleShouldForceLegacyLayout(const Element& element, } } - // No printing support in LayoutNG yet. - if (document.Printing() && element == document.documentElement()) { + if (document.Printing() && element == document.documentElement() && + !RuntimeEnabledFeatures::LayoutNGPrintingEnabled()) { UseCounter::Count(document, WebFeature::kLegacyLayoutByPrinting); return true; } diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc index d3ec3cec09c732..c42a3fd619ae7f 100644 --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc @@ -1144,7 +1144,7 @@ void HTMLDocumentParser::ConstructTreeFromHTMLToken() { } // We clear the token_ in case ConstructTreeFromAtomicToken - // synchronously re-enters the parser. We don't clear the token immedately + // synchronously re-enters the parser. We don't clear the token immediately // for kCharacter tokens because the AtomicHTMLToken avoids copying the // characters by keeping a pointer to the underlying buffer in the // HTMLToken. Fortunately, kCharacter tokens can't cause us to re-enter diff --git a/third_party/blink/renderer/core/layout/layout_object.h b/third_party/blink/renderer/core/layout/layout_object.h index 4692d7d0343f7e..cf45c65739641e 100644 --- a/third_party/blink/renderer/core/layout/layout_object.h +++ b/third_party/blink/renderer/core/layout/layout_object.h @@ -3723,6 +3723,10 @@ class CORE_EXPORT LayoutObject : public GarbageCollected, bitfields_.SetTransformAffectsVectorEffect(b); } + void SetMightTraversePhysicalFragments(bool b) { + bitfields_.SetMightTraversePhysicalFragments(b); + } + private: bool LocalToAncestorRectFastPath(const PhysicalRect& rect, const LayoutBoxModelObject* ancestor, diff --git a/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc b/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc index e2f11db2c0cd3e..0fe750ea99807d 100644 --- a/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc +++ b/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc @@ -13,6 +13,10 @@ namespace blink { LayoutNGView::LayoutNGView(ContainerNode* document) : LayoutNGBlockFlowMixin(document) { DCHECK(document->IsDocumentNode()); + + // This flag is normally set when an object is inserted into the tree, but + // this doesn't happen for LayoutNGView, since it's the root. + SetMightTraversePhysicalFragments(true); } LayoutNGView::~LayoutNGView() = default; diff --git a/third_party/blink/renderer/core/layout/ng/ng_block_node.cc b/third_party/blink/renderer/core/layout/ng/ng_block_node.cc index dd1148bff95b16..8a40af1bf0e774 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_block_node.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_block_node.cc @@ -23,6 +23,7 @@ #include "third_party/blink/renderer/core/layout/layout_table.h" #include "third_party/blink/renderer/core/layout/layout_table_cell.h" #include "third_party/blink/renderer/core/layout/layout_video.h" +#include "third_party/blink/renderer/core/layout/layout_view.h" #include "third_party/blink/renderer/core/layout/min_max_sizes.h" #include "third_party/blink/renderer/core/layout/ng/custom/layout_ng_custom.h" #include "third_party/blink/renderer/core/layout/ng/custom/ng_custom_layout_algorithm.h" @@ -189,11 +190,13 @@ NOINLINE void DetermineAlgorithmAndRun(const NGLayoutAlgorithmParams& params, // we would have done block fragmentation with the legacy engine. // Otherwise writing data back into the legacy tree will fail. Look for // the flow thread. - } else if (GetFlowThread(box)) { - if (style.SpecifiesColumns()) - CreateAlgorithmAndRun(params, callback); - else - CreateAlgorithmAndRun(params, callback); + } else if (GetFlowThread(box) && style.SpecifiesColumns()) { + CreateAlgorithmAndRun(params, callback); + } else if (!box.Parent() && + LayoutView::ShouldUsePrintingLayout(box.GetDocument())) { + DCHECK(box.IsLayoutView()); + DCHECK(RuntimeEnabledFeatures::LayoutNGPrintingEnabled()); + CreateAlgorithmAndRun(params, callback); } else { CreateAlgorithmAndRun(params, callback); } diff --git a/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc index 9fddca0548d1ba..e4acf123bff7af 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_page_layout_algorithm.cc @@ -40,6 +40,7 @@ scoped_refptr NGPageLayoutAlgorithm::Layout() { CalculateInitialFragmentGeometry(child_space, Node()); NGBlockLayoutAlgorithm child_algorithm( {Node(), fragment_geometry, child_space, break_token}); + child_algorithm.SetBoxType(NGPhysicalFragment::kPageBox); scoped_refptr result = child_algorithm.Layout(); const auto& page = result->PhysicalFragment(); diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.cc b/third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.cc index 9151fd3a2f3584..01f963ca26c806 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_physical_box_fragment.cc @@ -14,6 +14,7 @@ #include "third_party/blink/renderer/core/layout/layout_inline.h" #include "third_party/blink/renderer/core/layout/layout_object.h" #include "third_party/blink/renderer/core/layout/layout_object_inlines.h" +#include "third_party/blink/renderer/core/layout/layout_view.h" #include "third_party/blink/renderer/core/layout/ng/inline/layout_ng_text_combine.h" #include "third_party/blink/renderer/core/layout/ng/inline/ng_fragment_item.h" #include "third_party/blink/renderer/core/layout/ng/inline/ng_inline_cursor.h" @@ -549,10 +550,16 @@ const LayoutBox* NGPhysicalBoxFragment::OwnerLayoutBox() const { const LayoutBox* owner_box = DynamicTo(GetSelfOrContainerLayoutObject()); DCHECK(owner_box); - if (UNLIKELY(IsColumnBox())) { + if (UNLIKELY(IsFragmentainerBox())) { + if (owner_box->IsLayoutView()) { + DCHECK(IsPageBox()); + DCHECK(To(owner_box)->ShouldUsePrintingLayout()); + return owner_box; + } // Adjust the owner for column boxes. Column box fragment's |layout_object_| // is its multicol container, but |LayoutFlowThread::layout_results_| // has the column box fragments. + DCHECK(IsColumnBox()); owner_box = To(owner_box->SlowFirstChild()); DCHECK(owner_box && owner_box->IsLayoutFlowThread()); } @@ -620,11 +627,12 @@ const NGPhysicalBoxFragment* NGPhysicalBoxFragment::PostLayout() const { DCHECK(IsInlineBox()); return this; } - if (UNLIKELY(IsColumnBox())) { - // For column boxes, the logic does not work because non-last column box - // fragments may have null |BreakToken|, and |SequenceNumber| does not match - // the index of |LayoutBox::PhysicalFragments|. For this reason, - // |CloneWithPostLayoutFragments| has special logic to handle column boxes. + if (UNLIKELY(IsFragmentainerBox())) { + // For fragmentainers, the logic does not work because non-last + // fragmentainers may have null |BreakToken|, and |SequenceNumber| does not + // match the index of |LayoutBox::PhysicalFragments|. For this reason, + // |CloneWithPostLayoutFragments| has special logic to handle + // fragmentainers. #if DCHECK_IS_ON() // We can at least check whether |this| is the latest or not. if (!AllowPostLayoutScope::IsAllowed()) @@ -1062,10 +1070,10 @@ void NGPhysicalBoxFragment::RecalcInkOverflow() { // Copy the computed values to the |OwnerBox| if |this| is the last fragment. - // Column boxes may or may not have |BreakToken|s, and that + // Fragmentainers may or may not have |BreakToken|s, and that // |CopyVisualOverflowFromFragments| cannot compute stitched coordinate for // them. See crbug.com/1197561. - if (UNLIKELY(IsColumnBox())) + if (UNLIKELY(IsFragmentainerBox())) return; if (BreakToken()) { diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.cc b/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.cc index e801af3c5cd552..1c92ec745b65a6 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.cc @@ -49,6 +49,9 @@ String StringForBoxType(const NGPhysicalFragment& fragment) { case NGPhysicalFragment::NGBoxType::kColumnBox: result.Append("column"); break; + case NGPhysicalFragment::NGBoxType::kPageBox: + result.Append("page"); + break; case NGPhysicalFragment::NGBoxType::kAtomicInline: result.Append("atomic-inline"); break; @@ -547,10 +550,11 @@ void NGPhysicalFragment::CheckType() const { } else { DCHECK(layout_object_->IsBox()); } - if (IsColumnBox()) { - // Column fragments are associated with the same layout object as their - // multicol container. The fragments themselves are regular in-flow - // block container fragments for most purposes. + if (IsFragmentainerBox()) { + // Fragmentainers are associated with the same layout object as their + // multicol container (or the LayoutView, in case of printing). The + // fragments themselves are regular in-flow block container fragments + // for most purposes. DCHECK(layout_object_->IsLayoutBlockFlow()); DCHECK(IsBox()); DCHECK(!IsFloating()); diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.h b/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.h index ef57771cd665b3..1ddc8aec712fa3 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.h +++ b/third_party/blink/renderer/core/layout/ng/ng_physical_fragment.h @@ -71,6 +71,8 @@ class CORE_EXPORT NGPhysicalFragment // A multi-column container creates column boxes as its children, which // content is flowed into. https://www.w3.org/TR/css-multicol-1/#column-box kColumnBox, + // A page box fragment. Used by printing. + kPageBox, kAtomicInline, kFloating, kOutOfFlowPositioned, @@ -116,7 +118,8 @@ class CORE_EXPORT NGPhysicalFragment bool IsColumnBox() const { return IsBox() && BoxType() == NGBoxType::kColumnBox; } - bool IsFragmentainerBox() const { return IsColumnBox(); } + bool IsPageBox() const { return IsBox() && BoxType() == NGBoxType::kPageBox; } + bool IsFragmentainerBox() const { return IsColumnBox() || IsPageBox(); } bool IsColumnSpanAll() const { if (const auto* box = DynamicTo(GetLayoutObject())) return box->IsColumnSpanAll(); @@ -679,7 +682,7 @@ class CORE_EXPORT NGPhysicalFragment unsigned has_hanging_ : 1; const unsigned type_ : 1; // NGFragmentType - const unsigned sub_type_ : 3; // NGBoxType, NGTextType, or NGLineBoxType + const unsigned sub_type_ : 4; // NGBoxType, NGTextType, or NGLineBoxType const unsigned style_variant_ : 2; // NGStyleVariant const unsigned is_hidden_for_paint_ : 1; unsigned is_opaque_ : 1; diff --git a/third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter.cc b/third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter.cc index 9a68d9935fbc6e..c5f9bae4bc7f83 100644 --- a/third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter.cc +++ b/third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter.cc @@ -573,8 +573,9 @@ void NGBoxFragmentPainter::PaintObject( // AddURLRectIfNeeded() for LayoutInline. if (paint_info.ShouldAddUrlMetadata()) { const auto* layout_object = fragment.GetLayoutObject(); - if (!layout_object->IsLayoutInline() || - To(layout_object)->HasSelfPaintingLayer()) { + if (layout_object && + (!layout_object->IsLayoutInline() || + To(layout_object)->HasSelfPaintingLayer())) { NGFragmentPainter(fragment, GetDisplayItemClient()) .AddURLRectIfNeeded(paint_info, paint_offset); } diff --git a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc index f98dc5686ffed8..d06dfe64234b48 100644 --- a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc +++ b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc @@ -695,7 +695,8 @@ void PrePaintTreeWalk::WalkFragmentationContextRootChildren( const LayoutObject& object, const NGPhysicalBoxFragment& fragment, PrePaintTreeWalkContext& context) { - // The actual children are inside the flow thread child of |object|. + // If this is a multicol container, the actual children are inside the flow + // thread child of |object|. const auto* flow_thread = To(&object)->MultiColumnFlowThread(); const LayoutObject& actual_parent = flow_thread ? *flow_thread : object; @@ -773,36 +774,38 @@ void PrePaintTreeWalk::WalkFragmentationContextRootChildren( containing_block_context->paint_offset_for_oof_in_fragmentainer = paint_offset; - // Create corresponding |FragmentData|. Hit-testing needs - // |FragmentData.PaintOffset|. - if (fragmentainer_fragment_data) { - DCHECK(!box_fragment->IsFirstForNode()); + if (flow_thread) { + // Create corresponding |FragmentData|. Hit-testing needs + // |FragmentData.PaintOffset|. + if (fragmentainer_fragment_data) { + DCHECK(!box_fragment->IsFirstForNode()); #if DCHECK_IS_ON() - DCHECK_EQ(fragmentainer_owner_box, box_fragment->OwnerLayoutBox()); + DCHECK_EQ(fragmentainer_owner_box, box_fragment->OwnerLayoutBox()); #endif - fragmentainer_fragment_data = - &fragmentainer_fragment_data->EnsureNextFragment(); - } else { - const LayoutBox* owner_box = box_fragment->OwnerLayoutBox(); + fragmentainer_fragment_data = + &fragmentainer_fragment_data->EnsureNextFragment(); + } else { + const LayoutBox* owner_box = box_fragment->OwnerLayoutBox(); #if DCHECK_IS_ON() - DCHECK(!fragmentainer_owner_box); - fragmentainer_owner_box = owner_box; + DCHECK(!fragmentainer_owner_box); + fragmentainer_owner_box = owner_box; #endif - fragmentainer_fragment_data = - &owner_box->GetMutableForPainting().FirstFragment(); - if (box_fragment->IsFirstForNode()) { - fragmentainer_fragment_data->ClearNextFragment(); - } else { - // |box_fragment| is nested in another fragmentainer, and that it is - // the first one in this loop, but not the first one for the - // |LayoutObject|. Append a new |FragmentData| to the last one. fragmentainer_fragment_data = - &fragmentainer_fragment_data->LastFragment().EnsureNextFragment(); + &owner_box->GetMutableForPainting().FirstFragment(); + if (box_fragment->IsFirstForNode()) { + fragmentainer_fragment_data->ClearNextFragment(); + } else { + // |box_fragment| is nested in another fragmentainer, and that it is + // the first one in this loop, but not the first one for the + // |LayoutObject|. Append a new |FragmentData| to the last one. + fragmentainer_fragment_data = + &fragmentainer_fragment_data->LastFragment().EnsureNextFragment(); + } } + fragmentainer_fragment_data->SetPaintOffset(paint_offset); + fragmentainer_fragment_data->SetFragmentID( + context.current_fragmentainer.fragmentainer_idx); } - fragmentainer_fragment_data->SetPaintOffset(paint_offset); - fragmentainer_fragment_data->SetFragmentID( - context.current_fragmentainer.fragmentainer_idx); WalkChildren(actual_parent, box_fragment, context); diff --git a/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc b/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc index f85b8c8a90d8e4..7348edac2f1ff2 100644 --- a/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc +++ b/third_party/blink/renderer/modules/accessibility/inspector_accessibility_agent.cc @@ -1091,7 +1091,7 @@ void InspectorAccessibilityAgent::AXEventFired(AXObject* ax_object, // Since we do not serialize location data we can ignore changes to this. break; default: - AXObjectModified(ax_object, false); + MarkAXObjectDirty(ax_object); RefreshFrontendNodes(); break; } @@ -1124,6 +1124,7 @@ void InspectorAccessibilityAgent::AXObjectModified(AXObject* ax_object, } else { MarkAXObjectDirty(ax_object); } + RefreshFrontendNodes(); } void InspectorAccessibilityAgent::EnableAndReset() { diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index a406dbf37605fc..a52f0b821841ab 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -1358,6 +1358,7 @@ }, { name: "LayoutNGView", + implied_by: ["LayoutNGPrinting"], }, { name: "LazyFrameLoading", diff --git a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng index cb36f0b67355d5..0bdb559cab2066 100644 --- a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng +++ b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng @@ -13,6 +13,7 @@ # Tests that fail in legacy but pass in NG # ====== New tests from wpt-importer added here ====== +crbug.com/626703 external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html [ Failure ] crbug.com/626703 virtual/system-color-compute/external/wpt/css/css-color/oklch-008.html [ Failure ] crbug.com/626703 external/wpt/selection/textcontrols/onselectionchange-content-attribute.html [ Timeout ] crbug.com/626703 external/wpt/infrastructure/channels/test_call.html [ Timeout ] diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 15f10cb9b23b70..28b9fde374ae0f 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations @@ -1296,10 +1296,45 @@ virtual/layout_ng_grid_frag/external/wpt/css/css-break/grid/grid-item-fragmentat ### With LayoutNGPrinting enabled: +crbug.com/1121942 virtual/layout_ng_printing/printing/absolute-position-headers-and-footers.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/absolute-positioned.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/block-with-overflow-in-bottom-aligned-fixedpos.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-position-composited-crash.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-but-static-headers-and-footers.html [ Crash ] crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-child-repeats-even-when-html-and-body-are-zero-height.html [ Crash Pass ] crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-child-shouldnt-print.html [ Crash Pass ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-composited.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers-clipped.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers-inside-transform.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers-larger-than-page.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers-transformed.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-headers-and-footers.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-overflow-scroll.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned-scrolled.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/fixed-positioned.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/flexbox-with-overflow-in-bottom-aligned-fixedpos.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/forced-break-tree-dump-only.html [ Failure ] crbug.com/1121942 virtual/layout_ng_printing/printing/frameset.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/iframe-svg-in-object-print.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/multi-page-background.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/multicol-2-pages.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/multicol.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/named-page-breaks.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/no-content-empty-pages.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/overflow-auto.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/page-break-avoid.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/page-orientation-propagated.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/page-orientation.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/pageProperty-with-multicol.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/print-subframe.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/simultaneous-position-float-change.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/single-line-must-not-be-split-into-two-pages.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/thead-under-multicol.html [ Failure ] +crbug.com/1121942 virtual/layout_ng_printing/printing/vertical-lr.html [ Crash ] +crbug.com/1121942 virtual/layout_ng_printing/printing/vertical-rl.html [ Crash ] crbug.com/1121942 virtual/layout_ng_printing/printing/webgl-oversized-printing.html [ Skip ] +crbug.com/1121942 virtual/layout_ng_printing/printing/width-overflow.html [ Failure ] ### Textarea NG crbug.com/1140307 accessibility/inline-text-textarea.html [ Failure ] @@ -2784,6 +2819,14 @@ crbug.com/626703 [ Mac ] external/wpt/css/css-text/line-breaking/segment-break-t crbug.com/626703 [ Mac ] external/wpt/css/css-text/line-breaking/segment-break-transformation-rules-015.html [ Failure ] # ====== New tests from wpt-importer added here ====== +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-001.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-006.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-007.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklch-001.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklch-003.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/srgb-linear-002.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/xyz-d50-005.html [ Failure ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/xyz-d65-005.html [ Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/oklab-001.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/oklab-001.html [ Failure ] crbug.com/626703 [ Mac10.13 ] external/wpt/css/css-color/oklab-001.html [ Failure ] @@ -2801,7 +2844,7 @@ crbug.com/626703 [ Mac10.14 ] external/wpt/css/css-color/oklab-005.html [ Failur crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/oklab-005.html [ Failure ] crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-005.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/css/css-color/oklab-005.html [ Failure ] -crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/oklab-005.html [ Failure Crash ] +crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/oklab-005.html [ Crash Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/oklab-006.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/oklab-006.html [ Failure ] crbug.com/626703 [ Mac10.13 ] external/wpt/css/css-color/oklab-006.html [ Failure ] @@ -2815,7 +2858,7 @@ crbug.com/626703 [ Mac10.13 ] external/wpt/css/css-color/oklab-007.html [ Failur crbug.com/626703 [ Mac10.14 ] external/wpt/css/css-color/oklab-007.html [ Failure ] crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/oklab-007.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/css/css-color/oklab-007.html [ Failure ] -crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/oklab-007.html [ Failure Crash ] +crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/oklab-007.html [ Crash Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/oklab-008.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/oklab-008.html [ Failure ] crbug.com/626703 [ Mac10.13 ] external/wpt/css/css-color/oklab-008.html [ Failure ] @@ -2823,7 +2866,7 @@ crbug.com/626703 [ Mac10.14 ] external/wpt/css/css-color/oklab-008.html [ Failur crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/oklab-008.html [ Failure ] crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/oklab-008.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/css/css-color/oklab-008.html [ Failure ] -crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-008.html [ Failure Crash ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/oklab-008.html [ Crash Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/oklch-001.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/oklch-001.html [ Failure ] crbug.com/626703 [ Mac10.13 ] external/wpt/css/css-color/oklch-001.html [ Failure ] @@ -2862,7 +2905,7 @@ crbug.com/626703 [ Mac10.14 ] external/wpt/css/css-color/xyz-d50-002.html [ Fail crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/xyz-d50-002.html [ Failure ] crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/xyz-d50-002.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/css/css-color/xyz-d50-002.html [ Failure ] -crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/xyz-d50-002.html [ Failure Crash ] +crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/xyz-d50-002.html [ Crash Failure ] crbug.com/626703 external/wpt/css/css-color/xyz-d50-003.html [ Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/xyz-d50-004.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/xyz-d50-004.html [ Failure ] @@ -2886,7 +2929,7 @@ crbug.com/626703 [ Mac10.14 ] external/wpt/css/css-color/xyz-d65-002.html [ Fail crbug.com/626703 [ Mac10.15 ] external/wpt/css/css-color/xyz-d65-002.html [ Failure ] crbug.com/626703 [ Mac11 ] external/wpt/css/css-color/xyz-d65-002.html [ Failure ] crbug.com/626703 [ Win ] external/wpt/css/css-color/xyz-d65-002.html [ Failure ] -crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/xyz-d65-002.html [ Failure Crash ] +crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-color/xyz-d65-002.html [ Crash Failure ] crbug.com/626703 external/wpt/css/css-color/xyz-d65-003.html [ Failure ] crbug.com/626703 [ Linux ] external/wpt/css/css-color/xyz-d65-004.html [ Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/css/css-color/xyz-d65-004.html [ Failure ] @@ -2943,15 +2986,15 @@ crbug.com/626703 [ Mac10.14 ] virtual/system-color-compute/external/wpt/css/css- crbug.com/626703 [ Mac10.15 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-006.html [ Failure ] crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-006.html [ Failure ] crbug.com/626703 [ Win ] virtual/system-color-compute/external/wpt/css/css-color/oklch-006.html [ Failure ] -crbug.com/626703 [ Mac11-arm64 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-006.html [ Failure Crash ] +crbug.com/626703 [ Mac11-arm64 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-006.html [ Crash Failure ] crbug.com/626703 [ Linux ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] crbug.com/626703 [ Mac10.12 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] crbug.com/626703 [ Mac10.13 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] crbug.com/626703 [ Mac10.14 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] crbug.com/626703 [ Mac10.15 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] crbug.com/626703 [ Win ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure ] -crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Failure Crash ] -crbug.com/626703 [ Linux ] virtual/system-color-compute/external/wpt/css/css-color/oklch-008.html [ Failure Crash ] +crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/oklch-007.html [ Crash Failure ] +crbug.com/626703 [ Linux ] virtual/system-color-compute/external/wpt/css/css-color/oklch-008.html [ Crash Failure ] crbug.com/626703 [ Mac ] virtual/system-color-compute/external/wpt/css/css-color/oklch-008.html [ Failure ] crbug.com/626703 [ Win ] virtual/system-color-compute/external/wpt/css/css-color/oklch-008.html [ Failure ] crbug.com/626703 virtual/system-color-compute/external/wpt/css/css-color/srgb-linear-001.html [ Failure ] @@ -3007,7 +3050,7 @@ crbug.com/626703 [ Mac10.14 ] virtual/system-color-compute/external/wpt/css/css- crbug.com/626703 [ Mac10.15 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-002.html [ Failure ] crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-002.html [ Failure ] crbug.com/626703 [ Win ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-002.html [ Failure ] -crbug.com/626703 [ Mac11-arm64 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-002.html [ Failure Crash ] +crbug.com/626703 [ Mac11-arm64 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-002.html [ Crash Failure ] crbug.com/626703 [ Linux ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-003.html [ Failure ] crbug.com/626703 [ Mac10.12 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-003.html [ Failure ] crbug.com/626703 [ Mac10.13 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-003.html [ Failure ] @@ -3023,7 +3066,7 @@ crbug.com/626703 [ Mac10.14 ] virtual/system-color-compute/external/wpt/css/css- crbug.com/626703 [ Mac10.15 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-005.html [ Failure ] crbug.com/626703 [ Mac11-arm64 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-005.html [ Failure ] crbug.com/626703 [ Win ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-005.html [ Failure ] -crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-005.html [ Failure Crash ] +crbug.com/626703 [ Mac11 ] virtual/system-color-compute/external/wpt/css/css-color/xyz-d65-005.html [ Crash Failure ] crbug.com/626703 [ Mac11-arm64 ] external/wpt/css/css-flexbox/flexbox_flow-column-wrap.html [ Crash Failure ] crbug.com/626703 external/wpt/css/css-masking/clip-path/clip-path-borderBox-1a.html [ Failure ] crbug.com/626703 external/wpt/css/css-masking/clip-path/clip-path-borderBox-1b.html [ Failure ] @@ -3259,15 +3302,6 @@ crbug.com/626703 external/wpt/infrastructure/channels/test_serialize.html [ Time crbug.com/626703 [ Win10.20h2 ] external/wpt/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html [ Failure Timeout ] crbug.com/626703 [ Win10.20h2 ] virtual/feature-policy-permissions/external/wpt/mediacapture-streams/MediaDevices-enumerateDevices-per-origin-ids.sub.https.html [ Failure Timeout ] crbug.com/626703 [ Mac ] wpt_internal/webcodecs/basic_video_encoding.https.any.worker.html [ Crash Timeout ] -crbug.com/626703 [ Mac10.14 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ] -crbug.com/626703 [ Mac10.15 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ] -crbug.com/626703 [ Mac11 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ] -crbug.com/626703 [ Mac11-arm64 ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ] -crbug.com/626703 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-quirks-mode.html [ Failure ] -crbug.com/626703 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-writing-mode-rl.html [ Failure ] -crbug.com/626703 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors.html [ Failure ] -crbug.com/626703 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-frame-size-changed.html [ Failure ] -crbug.com/626703 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-inline-orientation.html [ Failure ] crbug.com/626703 [ Mac10.15 ] virtual/plz-dedicated-worker/external/wpt/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html [ Skip Timeout ] crbug.com/626703 [ Mac10.12 ] virtual/fenced-frame-mparch/wpt_internal/fenced_frame/presentation-receiver.https.html [ Crash Failure ] crbug.com/626703 [ Mac10.12 ] external/wpt/websockets/constructor/009.html?wpt_flags=h2 [ Crash Failure ] @@ -3340,7 +3374,6 @@ crbug.com/626703 [ Mac10.15 ] virtual/split-http-cache/external/wpt/signed-excha crbug.com/626703 [ Mac10.15 ] virtual/threaded-prefer-compositing/external/wpt/css/cssom-view/CaretPosition-001.html [ Timeout ] crbug.com/626703 [ Mac10.15 ] virtual/threaded/external/wpt/css/css-animations/computed-style-animation-parsing.html [ Timeout ] crbug.com/626703 [ Mac10.15 ] virtual/threaded/external/wpt/css/css-backgrounds/background-repeat/background-repeat-space.xht [ Timeout ] -crbug.com/626703 [ Mac10.15 ] virtual/threaded/external/wpt/scroll-animations/scroll-timelines/current-time-nan.html [ Timeout ] crbug.com/626703 [ Mac10.15 ] virtual/unified-autoplay/external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Timeout ] crbug.com/626703 [ Mac10.15 ] virtual/v8-off-thread-finalization/external/wpt/html/semantics/scripting-1/the-script-element/execution-timing/046.html [ Timeout ] crbug.com/626703 [ Mac10.15 ] virtual/v8-off-thread-finalization/external/wpt/html/semantics/scripting-1/the-script-element/execution-timing/049.html [ Timeout ] @@ -5833,6 +5866,15 @@ crbug.com/v8/11992 external/wpt/wasm/jsapi/tag/* [ Skip ] crbug.com/1080609 virtual/threaded/external/wpt/scroll-animations/element-based-offset.html [ Failure Pass ] crbug.com/1080609 virtual/threaded/external/wpt/scroll-animations/element-based-offset-clamp.html [ Failure Pass ] +# Assorted virtual/threaded/.../wpt/scroll-animations tests +crbug.com/1279648 [ Mac ] virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-iframe.html [ Failure ] +crbug.com/1279648 [ Mac10.15 ] virtual/threaded/external/wpt/scroll-animations/scroll-timelines/current-time-nan.html [ Timeout ] +crbug.com/1279648 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-quirks-mode.html [ Failure ] +crbug.com/1279648 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors-writing-mode-rl.html [ Failure ] +crbug.com/1279648 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-default-descriptors.html [ Failure ] +crbug.com/1279648 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-frame-size-changed.html [ Failure ] +crbug.com/1279648 virtual/threaded/external/wpt/scroll-animations/css/at-scroll-timeline-inline-orientation.html [ Failure ] + crbug.com/971031 [ Mac ] fast/dom/timer-throttling-hidden-page.html [ Failure Pass ] crbug.com/1071189 [ Debug ] editing/selection/programmatic-selection-on-mac-is-directionless.html [ Pass Timeout ] diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json index 9be3431aa3d498..452fd866e728a5 100644 --- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json +++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json @@ -194650,6 +194650,19 @@ {} ] ], + "inline-box-orthogonal-child-with-margins.html": [ + "dd0a596f3b725162cfd7486d062b77aab946f289", + [ + null, + [ + [ + "/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html", + "==" + ] + ], + {} + ] + ], "inline-replaced-vlr-003.xht": [ "1c33d6eb0262441f88428753cc3642fc6105f71a", [ @@ -268676,6 +268689,10 @@ "5766808360b42b93326a5228df72f5aae9a44c4c", [] ], + "inline-box-orthogonal-child-with-margins-ref.html": [ + "5bb6b9a95ce2d7a0e4d8ab4763a99d3034fac52d", + [] + ], "inline-replaced-vrl-002-ref.xht": [ "74a82ce960d5e13ff3a9eebe07de1c4741dbebef", [] @@ -448277,14 +448294,14 @@ {} ] ], - "show-picker-cross-origin-iframe.tentative.html": [ + "show-picker-cross-origin-iframe.html": [ "3a1c14efeeb0165596f22cddd2f3dd5f290b50cb", [ null, {} ] ], - "show-picker.tentative.html": [ + "show-picker.html": [ "6b94b4f0f00ea71c4e5a0740e315fe4c2fbbf896", [ null, diff --git a/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html b/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html new file mode 100644 index 00000000000000..5bb6b9a95ce2d7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins-ref.html @@ -0,0 +1,25 @@ + + + +
+
+
+
diff --git a/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html b/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html new file mode 100644 index 00000000000000..dd0a596f3b7251 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html @@ -0,0 +1,29 @@ + + + + + + + +
+
+
+
diff --git a/third_party/closure_compiler/externs/developer_private.js b/third_party/closure_compiler/externs/developer_private.js index eca28a05d3ee56..47f8cc75f93f64 100644 --- a/third_party/closure_compiler/externs/developer_private.js +++ b/third_party/closure_compiler/externs/developer_private.js @@ -333,7 +333,7 @@ chrome.developerPrivate.ExtensionInfo; * inDeveloperMode: boolean, * isDeveloperModeControlledByPolicy: boolean, * isIncognitoAvailable: boolean, - * isSupervised: boolean + * isChildAccount: boolean * }} */ chrome.developerPrivate.ProfileInfo; diff --git a/tools/accessibility/rebase_dump_accessibility_tree_test.py b/tools/accessibility/rebase_dump_accessibility_tree_test.py index 8cdab8b0f351d8..513b1056c0d80d 100755 --- a/tools/accessibility/rebase_dump_accessibility_tree_test.py +++ b/tools/accessibility/rebase_dump_accessibility_tree_test.py @@ -48,13 +48,13 @@ def Fix(line): line = result.group(1) # For Android tests: if line[:2] == 'I ': - result = re.search('I \d+\.\d+s run_tests_on_device\([0-9a-f]+\)\s+(.*)', + result = re.search('I \d+\.\d+s run_tests_on_device\([0-9a-f]+\) (.*)', line) if result: - line = result.group(1) + line = group(1) # For Android content_shell_test_apk tests: elif line[:2] == 'C ': - result = re.search('C \d+\.\d+s Main\s+([T|E|A|W|\+](.*))', line) + result = re.search('C \d+\.\d+s Main ([T|E|A|W|\+](.*))', line) if result: line = result.group(1) diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 7c25cba27d50a0..8e35c791bee0be 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml @@ -50949,6 +50949,7 @@ from previous Chrome versions. + @@ -52695,6 +52696,7 @@ from previous Chrome versions. + @@ -58332,6 +58334,13 @@ Called by update_use_counter_css.py.--> + + + + + + + @@ -59905,6 +59914,25 @@ Called by update_use_counter_css.py.--> + + + + + + + + + + + + + + + + + + diff --git a/tools/metrics/histograms/metadata/gpu/histograms.xml b/tools/metrics/histograms/metadata/gpu/histograms.xml index 0887b239551c71..457c71900f0c7b 100644 --- a/tools/metrics/histograms/metadata/gpu/histograms.xml +++ b/tools/metrics/histograms/metadata/gpu/histograms.xml @@ -1279,6 +1279,20 @@ chromium-metrics-reviews@google.com. + + cwallez@chromium.org + graphics-dev@chromium.org + + Read-write textures are not always supported on Metal. This histograms is + meant to gather information so that the WebGPU W3C group can decide whether + to require support for this feature. The reported tier is the best tier that + was found on the system. Meaning that if only one of the GPUs support + read-write textures, a non-zero tier will be reported. The histogram is + recorded at GPU process startup time. + + + ccameron@chromium.org diff --git a/tools/metrics/histograms/metadata/nearby/histograms.xml b/tools/metrics/histograms/metadata/nearby/histograms.xml index 733a7dead4bb2a..c9c3dba6306545 100644 --- a/tools/metrics/histograms/metadata/nearby/histograms.xml +++ b/tools/metrics/histograms/metadata/nearby/histograms.xml @@ -242,6 +242,97 @@ chromium-metrics-reviews@google.com. + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records each step in the background scanning notification flow if Nearby + Share onboarding is complete. Emitted after the notification that a nearby + device is trying to share is shown, and again when the user acts on the + notification by clicking enable, dismiss or exit. Clicking enable puts the + user in high-visibility mode. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records how long it takes for a user to act on a background scanning + notification if Nearby Share onboarding is complete. Emitted after the user + acts on the notification by clicking enable, dismiss or exit. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Logs an event when there were previously no devices nearby trying to share + and now there are nearby devices trying to share. Emitted when the nearby + devices trying to share changes from zero to greater than zero. A + notification will not be shown on this event if the user dismissed the + notification in the last 15 minutes.This metric is not emitted if the + background scanning feature is disabled. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records for how long nearby devices were trying to share. Emitted after the + number of devices trying to share goes from greater than zero to zero. This + metric is not emitted if the background scanning feature is disabled. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records whether an attempt to start a background scanning session succeeded + or failed. Emitted after the bluetooth adapter notifies whether starting the + background scanning session was successfully started. This metric is not + emitted if the background scanning feature is disabled. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records each step in the background scanning notification flow if Nearby + Share onboarding is not complete. Emitted after the notification that a + nearby device is trying to share is shown, and again when the user acts on + the notification by clicking setup, dismiss or exit. Clicking setup + initiates Nearby Share onboarding. + + + + + cvandermerwe@google.com + nearby-share-chromeos-eng@google.com + + Records how long it takes for a user to act on a background scanning + notification if Nearby Share onboarding is not complete. Emitted after the + user acts on the notification by clicking setup, dismiss or exit. + + + diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts index 12e5398203f19e..f282147fc05112 100644 --- a/tools/typescript/definitions/developer_private.d.ts +++ b/tools/typescript/definitions/developer_private.d.ts @@ -248,7 +248,7 @@ declare global { inDeveloperMode: boolean, isDeveloperModeControlledByPolicy: boolean, isIncognitoAvailable: boolean, - isSupervised: boolean, + isChildAccount: boolean, }; export type ExtensionConfigurationUpdate = { diff --git a/ui/ozone/platform/wayland/host/wayland_input_method_context.cc b/ui/ozone/platform/wayland/host/wayland_input_method_context.cc index f8a932081712f3..1ac224b217fb6f 100644 --- a/ui/ozone/platform/wayland/host/wayland_input_method_context.cc +++ b/ui/ozone/platform/wayland/host/wayland_input_method_context.cc @@ -585,9 +585,13 @@ void WaylandInputMethodContext::MaybeUpdateActivated() { WaylandWindow* window = connection_->wayland_window_manager()->GetCurrentKeyboardFocusedWindow(); + if (!window && !connection_->keyboard()) + window = connection_->wayland_window_manager()->GetCurrentActiveWindow(); // Activate Wayland IME only if 1) InputMethod in Chrome has some // TextInputClient connected, and 2) the actual keyboard focus of Wayland // is given to Chrome, which is notified via wl_keyboard::enter. + // If no keyboard is connected, the current active window is used for 2) + // instead (https://crbug.com/1168411). bool activated = focused_ && window; if (activated_ == activated) return; diff --git a/ui/ozone/platform/wayland/host/wayland_input_method_context_unittest.cc b/ui/ozone/platform/wayland/host/wayland_input_method_context_unittest.cc index b4ea88559a50d8..a45f1021ea5010 100644 --- a/ui/ozone/platform/wayland/host/wayland_input_method_context_unittest.cc +++ b/ui/ozone/platform/wayland/host/wayland_input_method_context_unittest.cc @@ -98,6 +98,7 @@ class TestInputMethodContextDelegate : public LinuxInputMethodContextDelegate { class WaylandInputMethodContextTest : public WaylandTest { public: WaylandInputMethodContextTest() = default; + ~WaylandInputMethodContextTest() override = default; WaylandInputMethodContextTest(const WaylandInputMethodContextTest&) = delete; WaylandInputMethodContextTest& operator=( const WaylandInputMethodContextTest&) = delete; @@ -105,8 +106,18 @@ class WaylandInputMethodContextTest : public WaylandTest { void SetUp() override { WaylandTest::SetUp(); + // WaylandInputMethodContext behaves differently when no keyboard is + // attached. + wl_seat_send_capabilities(server_.seat()->resource(), + WL_SEAT_CAPABILITY_KEYBOARD); + Sync(); + SetUpInternal(); + } + + protected: + void SetUpInternal() { input_method_context_delegate_ = std::make_unique(); @@ -132,7 +143,6 @@ class WaylandInputMethodContextTest : public WaylandTest { ASSERT_TRUE(zcr_extended_text_input_); } - protected: std::unique_ptr input_method_context_delegate_; std::unique_ptr input_method_context_; @@ -146,6 +156,7 @@ TEST_P(WaylandInputMethodContextTest, ActivateDeactivate) { // Scenario 1: InputMethod focus is set, then Keyboard focus is set. // Unset them in the reversed order. + EXPECT_CALL(*zwp_text_input_, Activate(surface_->resource())).Times(0); EXPECT_CALL(*zwp_text_input_, ShowInputPanel()).Times(0); input_method_context_->Focus(); @@ -483,6 +494,37 @@ TEST_P(WaylandInputMethodContextTest, input_method_context_delegate_->was_on_set_preedit_region_called()); } +class WaylandInputMethodContextNoKeyboardTest + : public WaylandInputMethodContextTest { + public: + WaylandInputMethodContextNoKeyboardTest() = default; + ~WaylandInputMethodContextNoKeyboardTest() override = default; + + void SetUp() override { + WaylandTest::SetUp(); + SetUpInternal(); + } +}; + +TEST_P(WaylandInputMethodContextNoKeyboardTest, ActivateDeactivate) { + // Because there is no keyboard, Activate is called as soon as InputMethod's + // TextInputClient focus is met. + + EXPECT_CALL(*zwp_text_input_, Activate(surface_->resource())); + EXPECT_CALL(*zwp_text_input_, ShowInputPanel()); + input_method_context_->Focus(); + connection_->ScheduleFlush(); + Sync(); + Mock::VerifyAndClearExpectations(zwp_text_input_); + + EXPECT_CALL(*zwp_text_input_, Deactivate()); + EXPECT_CALL(*zwp_text_input_, HideInputPanel()); + input_method_context_->Blur(); + connection_->ScheduleFlush(); + Sync(); + Mock::VerifyAndClearExpectations(zwp_text_input_); +} + INSTANTIATE_TEST_SUITE_P(XdgVersionStableTest, WaylandInputMethodContextTest, Values(wl::ServerConfig{ @@ -491,6 +533,14 @@ INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test, WaylandInputMethodContextTest, Values(wl::ServerConfig{ .shell_version = wl::ShellVersion::kV6})); +INSTANTIATE_TEST_SUITE_P(XdgVersionStableTest, + WaylandInputMethodContextNoKeyboardTest, + Values(wl::ServerConfig{ + .shell_version = wl::ShellVersion::kStable})); +INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test, + WaylandInputMethodContextNoKeyboardTest, + Values(wl::ServerConfig{ + .shell_version = wl::ShellVersion::kV6})); } // namespace } // namespace ui diff --git a/ui/ozone/platform/wayland/host/wayland_window_manager.cc b/ui/ozone/platform/wayland/host/wayland_window_manager.cc index 5d7d32d841cc38..52f17a55f6f727 100644 --- a/ui/ozone/platform/wayland/host/wayland_window_manager.cc +++ b/ui/ozone/platform/wayland/host/wayland_window_manager.cc @@ -64,6 +64,15 @@ WaylandWindow* WaylandWindowManager::GetWindowWithLargestBounds() const { return window_with_largest_bounds; } +WaylandWindow* WaylandWindowManager::GetCurrentActiveWindow() const { + for (const auto& entry : window_map_) { + WaylandWindow* window = entry.second; + if (window->IsActive()) + return window; + } + return nullptr; +} + WaylandWindow* WaylandWindowManager::GetCurrentFocusedWindow() const { for (const auto& entry : window_map_) { WaylandWindow* window = entry.second; diff --git a/ui/ozone/platform/wayland/host/wayland_window_manager.h b/ui/ozone/platform/wayland/host/wayland_window_manager.h index 8908d1d4217ee9..abefcdf91a125d 100644 --- a/ui/ozone/platform/wayland/host/wayland_window_manager.h +++ b/ui/ozone/platform/wayland/host/wayland_window_manager.h @@ -51,6 +51,9 @@ class WaylandWindowManager { // Returns a window with largests bounds. WaylandWindow* GetWindowWithLargestBounds() const; + // Returns a current active window. + WaylandWindow* GetCurrentActiveWindow() const; + // Returns a current focused window by pointer, touch, or keyboard. WaylandWindow* GetCurrentFocusedWindow() const;