Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #2

Merged
merged 98 commits into from
Mar 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
da47977
Roll Perfetto Trace Processor Win from 45e8b5dcf076 to ebf34ea84d5e
Mar 9, 2024
0159e23
Roll Perfetto Trace Processor Linux ARM from 5d20c91be5c8 to v43.2
Mar 9, 2024
680466b
PA: Prefer just "PartitionAlloc"
Mar 9, 2024
69a2a7b
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
8034ad1
No animation when showing minimized window
mitoshima Mar 9, 2024
ba46d84
Clean up DisablePolicyEthernetRecommendedWorkaround
Mar 9, 2024
d5cf462
Import wpt@04486cfcf88187cc480017f71d4107187b986e81
Mar 9, 2024
6d22d5e
Roll ios_internal from 2ada37c6ee80 to 118a16f566b5
Mar 9, 2024
712c6dd
Roll Skia from 8feb4b6a4aa6 to 0da56a6c7446 (1 revision)
Mar 9, 2024
ba0e515
Roll WebGPU CTS from 98673cc24786 to f71a8343c3b4 (38 revisions)
Mar 9, 2024
3993cd7
Roll Chrome Win64 PGO Profile
Mar 9, 2024
0d059ca
Roll clank/internal/apps from 94accc3114d9 to 678e88aff137 (1 revision)
Mar 9, 2024
37db2e9
Roll Dawn from 917c4a299ac5 to 65b18f2e7bfb (4 revisions)
Mar 9, 2024
876378a
Roll Chrome Win32 PGO Profile
Mar 9, 2024
114bfef
Roll Website from bf762130b1e3 to a309fe7733ed (6 revisions)
Mar 9, 2024
0dcb04b
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
773befd
Adjust Combobox accessibility role to `kComboBoxSelect`
Mar 9, 2024
7efb685
fix: Use correct size when GbmBuffer::CreateBufferWithModifiers
cute-anime-girl Mar 9, 2024
d483b45
Roll Chrome Android ARM32 PGO Profile
Mar 9, 2024
88c3a62
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
5632445
Roll Chrome Lacros Amd64 Generic PGO Profile
Mar 9, 2024
210cde9
Roll clank/internal/apps from 678e88aff137 to e025be368c1e (1 revision)
Mar 9, 2024
e12efc5
Fix run_all_fuzzers.py bug.
adetaylor Mar 9, 2024
f9ac5f0
Roll Chrome Win ARM64 PGO Profile
Mar 9, 2024
98c4e7f
Roll Chrome Win32 PGO Profile
Mar 9, 2024
ca98c17
Roll Chrome Win64 PGO Profile
Mar 9, 2024
922d427
Import wpt@d9a5cc25fc5f520bde022cee67e9e6a6f0b588f9
Mar 9, 2024
b3ec4d0
Roll clank/internal/apps from e025be368c1e to 561896327c1e (1 revision)
Mar 9, 2024
cb9c985
Updating XTBs based on .GRDs from branch main
Mar 9, 2024
ac9e1ac
[WebAuthn] Use correct string for confirm button
Mar 9, 2024
fec9e82
Roll Chrome Linux PGO Profile
Mar 9, 2024
b8948b7
Roll Projector App from W8wcIb4iPSQTFa99h... to S1pOLxk_3yoSyzzUf...
Mar 9, 2024
13738a8
Roll Chrome Mac PGO Profile
Mar 9, 2024
a7f4590
Roll clank/internal/apps from 561896327c1e to c8c4ee6f282b (1 revision)
Mar 9, 2024
f041553
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
0b6f247
Roll Help App from DM3voMv0YjydfnBz_... to ydtwfHOsVZOktExnR...
Mar 9, 2024
2d0f3dc
Updating trunk VERSION from 6348.0 to 6349.0
Mar 9, 2024
7f280d5
Roll Chrome Win32 PGO Profile
Mar 9, 2024
85f5e5b
Roll Chrome Win64 PGO Profile
Mar 9, 2024
675355c
Roll Perfetto from 6c7c3a5b31c4 to 45fe47bfe411 (2 revisions)
Mar 9, 2024
e465988
Roll Perfetto Trace Processor Mac from ebf34ea84d5e to 6c7c3a5b31c4
Mar 9, 2024
229d560
Roll clank/internal/apps from c8c4ee6f282b to a4c605ae7744 (1 revision)
Mar 9, 2024
c5c815a
Automatic update from google3
Mar 9, 2024
514ec0d
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
a5c12e5
Roll FreeType from 17545d4bf721 to f42ce25563b7 (1 revision)
Mar 9, 2024
d9c8cd6
Roll clank/internal/apps from a4c605ae7744 to 2f0fcf057e49 (1 revision)
Mar 9, 2024
29076d4
Roll Chrome Win32 PGO Profile
Mar 9, 2024
b7259ea
Roll Chrome Win64 PGO Profile
Mar 9, 2024
804e19d
[lacros skew tests] Refresh skew tests for M124
Mar 9, 2024
99c9840
Roll Chrome Android ARM32 PGO Profile
Mar 9, 2024
a08f827
Roll Skia from 0da56a6c7446 to 983774f73a16 (1 revision)
Mar 9, 2024
d700c9d
Roll Media App from aQGnlElXpARDVJqbN... to 42zk-N983bPLjVD5-...
Mar 9, 2024
f733b96
Roll Chrome Win ARM64 PGO Profile
Mar 9, 2024
c2773a0
Roll Perfetto Trace Processor Linux from ebf34ea84d5e to 6c7c3a5b31c4
Mar 9, 2024
a42b333
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
8afebaf
Roll Perfetto Trace Processor Win from ebf34ea84d5e to 6c7c3a5b31c4
Mar 9, 2024
600b283
Update OWNERS related to login flow.
Mar 9, 2024
7322da7
Roll clank/internal/apps from 2f0fcf057e49 to e97c7adf5a32 (1 revision)
Mar 9, 2024
47138e0
Roll Chrome Android ARM64 PGO Profile
Mar 9, 2024
7e6e6b5
Convert OSExchangeData virtual filenames to use std::optional
Mar 9, 2024
54c90cd
Update the timing to unblock post-login tasks.
Mar 9, 2024
cf6c13a
Set Runner on CopyOutputRequest when added
mitoshima Mar 9, 2024
c3e82a5
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
bb62d31
[local compile hints] Fix the WebCore.Scripts.V8CompileHintsStatus hi…
marjakh Mar 9, 2024
e1b6bfe
Roll Chrome Win64 PGO Profile
Mar 9, 2024
374c406
Roll ios_internal from 118a16f566b5 to 5ceff7e6baba
Mar 9, 2024
27dc339
Roll clank/internal/apps from e97c7adf5a32 to 038cb86ae9fe (1 revision)
Mar 9, 2024
ab381e9
Roll Skia from 983774f73a16 to 8b92038ff67f (1 revision)
Mar 9, 2024
9991559
Roll Chrome Mac Arm PGO Profile
Mar 9, 2024
17a0186
Roll Chrome Win32 PGO Profile
Mar 9, 2024
6a31f71
Roll clank/internal/apps from 038cb86ae9fe to eecbcc768fae (1 revision)
Mar 9, 2024
42693cd
Roll Fuchsia Internal Images from 19.20240302.2.1 to 19.20240309.3.1
Mar 9, 2024
84608e0
Roll Chrome Win64 PGO Profile
Mar 10, 2024
70a7ede
Roll PDFium from 4b608cc6995d to bfa3a7cf2cf6 (2 revisions)
Mar 10, 2024
238bea0
Roll Chrome Android ARM32 PGO Profile
Mar 10, 2024
f397e8b
Roll Chrome Win ARM64 PGO Profile
Mar 10, 2024
35e1042
Roll Chrome Mac Arm PGO Profile
Mar 10, 2024
3393263
Roll clank/internal/apps from eecbcc768fae to 4e94cb8a684c (1 revision)
Mar 10, 2024
e6590c4
Roll Chrome Win32 PGO Profile
Mar 10, 2024
31f490c
Roll clank/internal/apps from 4e94cb8a684c to 173417837966 (1 revision)
Mar 10, 2024
1429770
scanning: change DLC path
Mar 10, 2024
71fb319
Roll Dawn from 65b18f2e7bfb to aedac998b848 (1 revision)
Mar 10, 2024
4911dcb
Roll Chrome Lacros Amd64 Generic PGO Profile
Mar 10, 2024
89d4c05
Roll Perfetto Trace Processor Mac from 6c7c3a5b31c4 to 45fe47bfe411
Mar 10, 2024
0a80e6b
Roll Chrome Win64 PGO Profile
Mar 10, 2024
7fc43f0
Roll Chrome Mac Arm PGO Profile
Mar 10, 2024
c96ed6e
Roll Chrome Win32 PGO Profile
Mar 10, 2024
21fcef4
Updating trunk VERSION from 6349.0 to 6350.0
Mar 10, 2024
5b9b719
Roll Skia from 8b92038ff67f to e6b884229d2d (1 revision)
Mar 10, 2024
d51fffa
Roll clank/internal/apps from 173417837966 to c8e1854a018a (1 revision)
Mar 10, 2024
b360457
Removed DCHECK from BackgroundModeManager::OnProfileWillBeRemoved
rishikramena-ms Mar 10, 2024
2040511
Roll clank/internal/apps from c8e1854a018a to 5294388cd673 (1 revision)
Mar 10, 2024
189464e
Roll Chrome Win64 PGO Profile
Mar 10, 2024
3ecd013
Roll Chrome Win32 PGO Profile
Mar 10, 2024
6ca6be9
Roll Chrome Android ARM32 PGO Profile
Mar 10, 2024
9c69256
Roll Chrome Win ARM64 PGO Profile
Mar 10, 2024
95c4c32
Roll Chrome Mac Arm PGO Profile
Mar 10, 2024
25ee2d8
Roll clank/internal/apps from 5294388cd673 to 26d5862431af (1 revision)
Mar 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and whatever else without interference from each other.
'skia_revision': '8feb4b6a4aa6a64e709f69afa0613527292c73d4',
'skia_revision': 'e6b884229d2dcef8f81c411fc6862c5844524e15',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling V8
# and whatever else without interference from each other.
Expand All @@ -328,7 +328,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFium
# and whatever else without interference from each other.
'pdfium_revision': '4b608cc6995d1abb5d7e2480de9abe35bc3799be',
'pdfium_revision': 'bfa3a7cf2cf68c8fcbb4ac7f2cfd45b37185cf0e',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
Expand Down Expand Up @@ -363,7 +363,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
'freetype_revision': '17545d4bf72175a8ea8020dcbd4d462234d2b5d0',
'freetype_revision': 'f42ce25563b73fed0123d18a2556b9ba01d2c76b',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
Expand Down Expand Up @@ -427,7 +427,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'dawn_revision': '917c4a299ac53b8d793da405211825172120b98e',
'dawn_revision': 'aedac998b8483e5b818aec3b912eca8b6c803326',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
Expand Down Expand Up @@ -827,12 +827,12 @@ deps = {

'src/clank': {
'url': Var('chrome_git') + '/clank/internal/apps.git' + '@' +
'94accc3114d90c6807df2973049c2b42fc4caeb6',
'26d5862431afc78505426a0e36cc1fddc4a7029b',
'condition': 'checkout_android and checkout_src_internal',
},

'src/docs/website': {
'url': Var('chromium_git') + '/website.git' + '@' + 'bf762130b1e39f762f9db5c3b636d952a4962467',
'url': Var('chromium_git') + '/website.git' + '@' + 'a309fe7733ed859a3215a7446565bec89a9e2127',
},

'src/ios/third_party/earl_grey2/src': {
Expand Down Expand Up @@ -1665,7 +1665,7 @@ deps = {
Var('pdfium_git') + '/pdfium.git' + '@' + Var('pdfium_revision'),

'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '6c7c3a5b31c4b4bf6814e95ac8482ef727327dec',
Var('android_git') + '/platform/external/perfetto.git' + '@' + '45fe47bfe4111454ba7063b9b4d438369090d6ba',

'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '8ef97ff3b7332e38e61b347a2fbed425a4617151',
Expand Down Expand Up @@ -1847,7 +1847,7 @@ deps = {
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'f4bf599a8b575df685c31d9c4729a70a04e377ed',

'src/third_party/webgpu-cts/src':
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '98673cc24786be6c10dd8908e0b0b4ed27625c6a',
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'f71a8343c3b4ea23eddf0cf35b9957a0b45b0cf3',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '0268a05fd04d345f96082caf9b20e1949e3290bb',
Expand Down Expand Up @@ -1973,7 +1973,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/help_app/app',
'version': 'DM3voMv0YjydfnBz_Po89uGkVBb-5FyKJtfCehtp5EcC',
'version': 'ydtwfHOsVZOktExnR0LVAAzF5XGu2TxQ009hR4ep2fcC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand All @@ -1984,7 +1984,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/media_app/app',
'version': 'aQGnlElXpARDVJqbNQhqp4OwRnKP6dNNcV0UfoG_BDgC',
'version': '42zk-N983bPLjVD5-de59KR6ha-yOSnRO30CYMzRjTQC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand Down Expand Up @@ -2017,7 +2017,7 @@ deps = {
'packages': [
{
'package': 'chromeos_internal/apps/projector_app/app',
'version': 'W8wcIb4iPSQTFa99hvFZSSo575m70GTZMsBU85FA8mYC',
'version': 'S1pOLxk_3yoSyzzUfSdgQ0vvMmRLfG6yaKad41RPda0C',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
Expand Down Expand Up @@ -4096,7 +4096,7 @@ deps = {

'src/ios_internal': {
'url': Var('chrome_git') + '/chrome/ios_internal.git' + '@' +
'2ada37c6ee8092f9886208e958ed1baacab8450b',
'5ceff7e6baba4435b67506e9b41355e70ffe19c1',
'condition': 'checkout_ios and checkout_src_internal',
},

Expand Down
2 changes: 0 additions & 2 deletions ash/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1178,8 +1178,6 @@ component("ash") {
"scalable_iph/scalable_iph_ash_notification_view.h",
"scalable_iph/wallpaper_ash_notification_view.cc",
"scalable_iph/wallpaper_ash_notification_view.h",
"scoped_animation_disabler.cc",
"scoped_animation_disabler.h",
"screen_util.cc",
"screen_util.h",
"sensor_info/sensor_provider.cc",
Expand Down
7 changes: 4 additions & 3 deletions ash/app_list/app_list_controller_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/screen_util.h"
#include "ash/session/session_controller_impl.h"
#include "ash/shelf/home_button.h"
Expand Down Expand Up @@ -81,6 +80,7 @@
#include "ui/display/screen.h"
#include "ui/display/util/display_util.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/wm/core/scoped_animation_disabler.h"
#include "ui/wm/core/window_animations.h"

namespace ash {
Expand Down Expand Up @@ -676,10 +676,11 @@ bool AppListControllerImpl::GoHome(int64_t display_id) {
//
// TODO(https://crbug.com/1019531): This can be removed once transitions
// between in-app state and home do not cause work area updates.
std::vector<std::unique_ptr<ScopedAnimationDisabler>> animation_disablers;
std::vector<std::unique_ptr<wm::ScopedAnimationDisabler>>
animation_disablers;
for (aura::Window* window : foreground_windows) {
animation_disablers.push_back(
std::make_unique<ScopedAnimationDisabler>(window));
std::make_unique<wm::ScopedAnimationDisabler>(window));
}

OnHomeLauncherPositionChanged(/*percent_shown=*/100, display_id);
Expand Down
2 changes: 1 addition & 1 deletion ash/drag_drop/tab_drag_drop_delegate_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "ash/constants/ash_features.h"
#include "ash/public/cpp/new_window_delegate.h"
#include "ash/public/cpp/test/test_new_window_delegate.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
Expand Down Expand Up @@ -40,6 +39,7 @@
#include "ui/compositor/test/test_utils.h"
#include "ui/events/test/event_generator.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/wm/core/scoped_animation_disabler.h"
#include "ui/wm/core/window_util.h"

using ::base::test::RunOnceCallback;
Expand Down
6 changes: 3 additions & 3 deletions ash/drag_drop/tab_drag_drop_windows_hider.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#include "ash/public/cpp/window_backdrop.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/shell.h"
#include "ash/wallpaper/views/wallpaper_widget_controller.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/overview/overview_controller.h"
#include "ui/aura/window.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/wm/core/scoped_animation_disabler.h"

namespace ash {

Expand All @@ -42,7 +42,7 @@ TabDragDropWindowsHider::TabDragDropWindowsHider(aura::Window* source_window)

window_visibility_map_.emplace(window, window->IsVisible());
if (window->IsVisible()) {
ScopedAnimationDisabler disabler(window);
wm::ScopedAnimationDisabler disabler(window);
window->Hide();
}
window->AddObserver(this);
Expand Down Expand Up @@ -71,7 +71,7 @@ TabDragDropWindowsHider::~TabDragDropWindowsHider() {
iter != window_visibility_map_.end(); ++iter) {
iter->first->RemoveObserver(this);
if (iter->second) {
ScopedAnimationDisabler disabler(iter->first);
wm::ScopedAnimationDisabler disabler(iter->first);
iter->first->Show();
}
}
Expand Down
16 changes: 10 additions & 6 deletions ash/login/LOGIN_LOCK_OWNERS
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# Primary (in CET)
# cryptohome/UI (in CET)
[email protected]
[email protected]
[email protected]

#Secondary (in CET)
[email protected]

# OOBE/onboarding (in CET):
[email protected]
[email protected]

# Secondary (in PST)
[email protected]
# Login performance (in PST)
[email protected]
[email protected]

# Lock screen and app (in PST)
[email protected]

# User/session management, Profile (in JST)
[email protected]
19 changes: 14 additions & 5 deletions ash/metrics/login_unlock_throughput_recorder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,19 @@ void LoginUnlockThroughputRecorder::ScheduleWaitForShelfAnimationEndIfNeeded() {
weak_ptr_factory_.GetWeakPtr());

(new AnimationObserver(on_animation_end))->StartObserving();

// Unblock deferred task now.
// TODO(b/328339021, b/323098858): This is the mitigation against a bug
// that animation observation has race condition.
// Can be in a part of better architecture.
AddLoginTimeMarker("BootTime.Login4");
base::UmaHistogramCustomTimes(
"BootTime.Login4", base::TimeTicks::Now() - primary_user_logged_in_,
base::Milliseconds(100), base::Seconds(100), 100);
login_animation_finished_timer_.Stop();
if (!post_login_deferred_task_runner_->Started()) {
post_login_deferred_task_runner_->Start();
}
}

void LoginUnlockThroughputRecorder::OnAllExpectedShelfIconsLoaded() {
Expand Down Expand Up @@ -600,6 +613,7 @@ void LoginUnlockThroughputRecorder::AddLoginTimeMarker(
REPORT_LOGIN_THROUGHPUT_EVENT("Ash.LoginAnimation.Duration2.TabletMode");
REPORT_LOGIN_THROUGHPUT_EVENT("BootTime.Login2");
REPORT_LOGIN_THROUGHPUT_EVENT("BootTime.Login3");
REPORT_LOGIN_THROUGHPUT_EVENT("BootTime.Login4");
REPORT_LOGIN_THROUGHPUT_EVENT(
"Ash.UnlockAnimation.Smoothness.ClamshellMode");
REPORT_LOGIN_THROUGHPUT_EVENT("Ash.UnlockAnimation.Smoothness.TabletMode");
Expand Down Expand Up @@ -683,11 +697,6 @@ void LoginUnlockThroughputRecorder::MaybeReportLoginFinished() {
base::Milliseconds(100), base::Seconds(100), 100);

LoginEventRecorder::Get()->RunScheduledWriteLoginTimes();

login_animation_finished_timer_.Stop();
if (!post_login_deferred_task_runner_->Started()) {
post_login_deferred_task_runner_->Start();
}
}

void LoginUnlockThroughputRecorder::OnLoginAnimationFinishedTimerFired() {
Expand Down
4 changes: 2 additions & 2 deletions ash/root_window_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_settings.h"
#include "ash/rotator/screen_rotation_animator.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/screen_util.h"
#include "ash/session/session_controller_impl.h"
#include "ash/shelf/shelf.h"
Expand Down Expand Up @@ -105,6 +104,7 @@
#include "ui/views/widget/widget.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/core/scoped_animation_disabler.h"
#include "ui/wm/core/visibility_controller.h"
#include "ui/wm/core/window_properties.h"
#include "ui/wm/core/window_util.h"
Expand Down Expand Up @@ -926,7 +926,7 @@ void RootWindowController::HideContextMenuNoAnimation() {
views::Widget* submenu_widget =
root_window_menu_model_adapter_->GetSubmenuWidget();
DCHECK(submenu_widget);
ScopedAnimationDisabler disable(submenu_widget->GetNativeWindow());
wm::ScopedAnimationDisabler disable(submenu_widget->GetNativeWindow());
root_window_menu_model_adapter_->Cancel();
}

Expand Down
4 changes: 2 additions & 2 deletions ash/shelf/drag_window_from_shelf_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "ash/public/cpp/window_backdrop.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/screen_util.h"
#include "ash/shelf/hotseat_widget.h"
#include "ash/shelf/shelf.h"
Expand Down Expand Up @@ -53,6 +52,7 @@
#include "ui/gfx/geometry/transform_util.h"
#include "ui/views/animation/animation_builder.h"
#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/core/scoped_animation_disabler.h"
#include "ui/wm/core/window_util.h"

namespace ash {
Expand Down Expand Up @@ -177,7 +177,7 @@ class DragWindowFromShelfController::WindowsHider
void RestoreWindowsVisibility() {
for (aura::Window* window : hidden_windows_) {
window->RemoveObserver(this);
ScopedAnimationDisabler disabler(window);
wm::ScopedAnimationDisabler disabler(window);
window->Show();
window->ClearProperty(kHideDuringWindowDragging);
}
Expand Down
2 changes: 1 addition & 1 deletion ash/shelf/window_scale_animation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "ash/public/cpp/shelf_config.h"
#include "ash/public/cpp/window_backdrop.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/scoped_animation_disabler.h"
#include "ash/screen_util.h"
#include "ash/shelf/shelf.h"
#include "ash/shell.h"
Expand All @@ -27,6 +26,7 @@
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/geometry/transform.h"
#include "ui/wm/core/scoped_animation_disabler.h"

namespace ash {

Expand Down
2 changes: 2 additions & 0 deletions ash/strings/ash_strings_bn.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<translation id="1111021433905331574">'সেটিংস' &gt; <ph name="APP_TITLE" /> থেকে কীবোর্ড ব্যাকলাইটের রঙ পরিবর্তন করতে পারবেন</translation>
<translation id="1117719261843403176">মোবাইল ডেটা টগল করুন। <ph name="STATE" />।</translation>
<translation id="112308213915226829">তাককে স্বয়ংক্রিয়ভাবে লুকান</translation>
<translation id="1129383337808748948"><ph name="CONTENT_TITLE" /> রিফ্রেশ করুন</translation>
<translation id="1142002900084379065">সাম্প্রতিক ফটো</translation>
<translation id="114221662579355151">এর ফলে <ph name="APP1_NAME" />, <ph name="APP2_NAME" /> এবং ক্যামেরা ও মাইক্রোফোন ব্যবহার করার অনুমতি আছে এমন সমস্ত অ্যাপ ও ওয়েবসাইটে ক্যামেরা অ্যাক্সেস করা যায়। আপনাকে ওয়েব পেজ রিফ্রেশ করতে বা অ্যাপটি রিস্টার্ট করতে হতে পারে।</translation>
<translation id="1148499908455722006"><ph name="USER_NAME" />-এর জন্য অ্যাকাউন্টের তথ্য সহ ডায়ালগ খুলুন</translation>
Expand Down Expand Up @@ -1827,6 +1828,7 @@
<translation id="8247060538831475781"><ph name="CONNECTION_STATUS" />, সিগন্যাল: <ph name="SIGNAL_STRENGTH" />, ফোনের ব্যাটারি <ph name="BATTERY_STATUS" /></translation>
<translation id="8247998213073982446"><ph name="APP_NAME" />, অ্যাপ</translation>
<translation id="8255234195843591763">আপডেট করতে রিসেট করুন</translation>
<translation id="8257510091797044096">আপনার ডিভাইস সেট-আপ করুন</translation>
<translation id="8261506727792406068">মুছুন</translation>
<translation id="8262312463845990408">প্লেব্যাক টগল করুন</translation>
<translation id="8270450402312105425">{0,plural, =1{১ ঘণ্টার মধ্যে ডিভাইসটি আগের ভার্সনে ফিরিয়ে নিয়ে যান}one{# ঘণ্টার মধ্যে ডিভাইসটি আগের ভার্সনে ফিরিয়ে নিয়ে যান}other{# ঘণ্টার মধ্যে ডিভাইসটি আগের ভার্সনে ফিরিয়ে নিয়ে যান}}</translation>
Expand Down
2 changes: 2 additions & 0 deletions ash/strings/ash_strings_bs.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Možete isprobati ovih nekoliko stvari da započnete.</translation>
<translation id="1111021433905331574">Možete promijeniti boju pozadinskog osvjetljenja tastature u Postavkama &gt; <ph name="APP_TITLE" /></translation>
<translation id="1117719261843403176">Uključite/isključite prijenos podataka na mobilnoj mreži. <ph name="STATE" />.</translation>
<translation id="112308213915226829">Automatski sakrij policu</translation>
<translation id="1129383337808748948">Osvježi "<ph name="CONTENT_TITLE" />"</translation>
<translation id="1142002900084379065">Nedavne fotografije</translation>
<translation id="114221662579355151">Ovo dozvoljava pristup kameri za aplikacije <ph name="APP1_NAME" /> i <ph name="APP2_NAME" /> te sve aplikacije i web lokacije s odobrenjem za nju. Možda ćete morati osvježiti web stranicu ili ponovo pokrenuti aplikaciju.</translation>
<translation id="1148499908455722006">Otvaranje informativnog dijaloškog okvira za korisnika <ph name="USER_NAME" /></translation>
Expand Down Expand Up @@ -1826,6 +1827,7 @@ Da isključite uređaj, ponovo pritisnite i zadržite dugme za uključivanje na
<translation id="8247060538831475781"><ph name="CONNECTION_STATUS" />, jačina signala <ph name="SIGNAL_STRENGTH" />, baterija telefona <ph name="BATTERY_STATUS" /></translation>
<translation id="8247998213073982446"><ph name="APP_NAME" />, aplikacija</translation>
<translation id="8255234195843591763">Vratite na zadano radi ažuriranja</translation>
<translation id="8257510091797044096">Postavite uređaj</translation>
<translation id="8261506727792406068">Izbriši</translation>
<translation id="8262312463845990408">Uključi/isključi reprodukciju</translation>
<translation id="8270450402312105425">{0,plural, =1{Vratite uređaj na prethodnu verziju u roku od jednog sata}one{Vratite uređaj na prethodnu verziju u roku od # sata}few{Vratite uređaj na prethodnu verziju u roku od # sata}other{Vratite uređaj na prethodnu verziju u roku od # sati}}</translation>
Expand Down
2 changes: 2 additions & 0 deletions ash/strings/ash_strings_hr.xtb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Evo nekih stvari koje možete pokušati pokrenuti.</translation>
<translation id="1111021433905331574">Boju pozadinskog osvjetljenja tipkovnice možete promijeniti u odjeljku Postavke &gt; <ph name="APP_TITLE" /></translation>
<translation id="1117719261843403176">Uključite/isključite mobilne podatke. <ph name="STATE" />.</translation>
<translation id="112308213915226829">Automatski sakrij policu</translation>
<translation id="1129383337808748948">Osvježi <ph name="CONTENT_TITLE" /></translation>
<translation id="1142002900084379065">Nedavne fotografije</translation>
<translation id="114221662579355151">To omogućuje pristup kameri za aplikacije <ph name="APP1_NAME" /> i <ph name="APP2_NAME" /> te sve aplikacije i web-lokacije s dopuštenjem za kameru. Možda ćete morati osvježiti web-stranicu ili ponovo pokrenuti aplikaciju.</translation>
<translation id="1148499908455722006">Otvorite dijaloški okvir s podacima o računu <ph name="USER_NAME" /></translation>
Expand Down Expand Up @@ -1826,6 +1827,7 @@ Da biste isključili uređaj, ponovno pritisnite i zadržite tipku za uključiva
<translation id="8247060538831475781"><ph name="CONNECTION_STATUS" />, jačina signala <ph name="SIGNAL_STRENGTH" />, telefonska baterija <ph name="BATTERY_STATUS" /></translation>
<translation id="8247998213073982446"><ph name="APP_NAME" />, aplikacija</translation>
<translation id="8255234195843591763">Vratite na zadano radi ažuriranja</translation>
<translation id="8257510091797044096">Postavljanje uređaja</translation>
<translation id="8261506727792406068">Izbriši</translation>
<translation id="8262312463845990408">Uključi/isključi reprodukciju</translation>
<translation id="8270450402312105425">{0,plural, =1{Vratite uređaj na prethodnu verziju u roku od sat vremena}one{Vratite uređaj na prethodnu verziju u roku od # h}few{Vratite uređaj na prethodnu verziju u roku od # h}other{Vratite uređaj na prethodnu verziju u roku od # h}}</translation>
Expand Down
Loading