FairyWorld · pull · Dec 13, 2021 · Dec 13, 2021 · Dec 13, 2021 · Dec 13, 2021
diff --git a/DEPS b/DEPS
@@ -239,7 +239,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': '507884bf3d7519d37443dd88d052d43df41db339',
+  'skia_revision': 'e4bccab4ac7ceb76cd99b9c92c2b1729c7e60aaf',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # 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': '0e3067f96d33d956c373562cbe2229daf70ae9ca',
+  'devtools_frontend_revision': '7f5c3ecd65d7ca4f8a62c4d61fda43be64d0cc59',
   # 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.
@@ -354,7 +354,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': 'b320f17000595ebd06f63aadece200375d83228d',
+  'dawn_revision': 'e00c6bd39584aa864e37140637ec6bed7dc57ea8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -398,7 +398,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.
-  'libcxxabi_revision':    '58799ca24f08088ab1db9cdf7d67ee8b1f4bc605',
+  'libcxxabi_revision':    '603d9d1067d178ee2dbd1ba8028413baa876a771',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -421,7 +421,7 @@ vars = {
   'libcxx_revision':       '79a2e924d96e2fc1e4b937c42efd08898fa472d7',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f',
+  'gn_version': 'git_revision:2e56c317bd8e2bf152cfa2ead6ac5fa476fe28b4',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -727,7 +727,7 @@ deps = {
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': 'hLuT4gVcqpeZfALZhISQl3bzHj2UwIa_WzhnNzYnhOgC',
+          'version': 'yVc-vTWsYEzs3l22SOOsPdO_AWBNR3HP71lX3Q4VQQYC',
         },
       ],
       'dep_type': 'cipd',
@@ -1069,7 +1069,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/google/farmhash.git' + '@' + '816a4ae622e964763ca0862d9dbd19324a1eaf45',
 
   'src/third_party/ffmpeg':
-    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'd151785b5b0ef367e225f8a5702c36d2dccc8bb3',
+    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '53de560ab9b797efa43c7e2643cde1be5dcc2450',
 
   'src/third_party/flac':
     Var('chromium_git') + '/chromium/deps/flac.git' + '@' + 'af862024c8c8fa0ae07ced05e89013d881b00596',
@@ -1421,7 +1421,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '1302b4259684a591a9519ed3f3d3e490554ad05c',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + '86b18b837a45380f1b9070cb765ec5864994942c',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
@@ -1642,7 +1642,7 @@ deps = {
     Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'aa6dcde554d68ea68684af3e6699541ff6067793',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + 'a6b138d6b4ef3a5b2c87f899b67f3b5c8dd3c002',
+    Var('webrtc_git') + '/src.git' + '@' + '699d1a242ecd3ca819293cfa96f5dcf8f5e1b91a',
 
   'src/third_party/libgifcodec':
      Var('skia_git') + '/libgifcodec' + '@'+  Var('libgifcodec_revision'),
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@7499f7d4e8b61b0e3d2a8b6227a55e5cd8dccee6',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@3bdd0bbcef1c863a758c898f0e212d83a03e5d6b',
     'condition': 'checkout_src_internal',
   },
 

diff --git a/ash/accessibility/magnifier/docked_magnifier_controller.cc b/ash/accessibility/magnifier/docked_magnifier_controller.cc
@@ -11,6 +11,7 @@
 #include "ash/accessibility/magnifier/magnifier_utils.h"
 #include "ash/constants/ash_pref_names.h"
 #include "ash/host/ash_window_tree_host.h"
+#include "ash/keyboard/ui/keyboard_ui_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"
@@ -279,6 +280,15 @@ void DockedMagnifierController::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* event_root = target->GetRootWindow();
   gfx::Point event_screen_point = event->root_location();
   ::wm::ConvertPointToScreen(event_root, &event_screen_point);
+
+  // Ignore touch events on virtual Keyboard, to stabilize docked magnifier.
+  if (keyboard::KeyboardUIController::Get()->IsEnabled() &&
+      keyboard::KeyboardUIController::Get()
+          ->GetKeyboardWindow()
+          ->GetBoundsInScreen()
+          .Contains(event_screen_point))
+    return;
+
   CenterOnPoint(event_screen_point);
 }
 

diff --git a/ash/app_list/views/continue_task_container_view.cc b/ash/app_list/views/continue_task_container_view.cc
@@ -30,7 +30,8 @@ using views::TableLayout;
 namespace ash {
 namespace {
 // Suggested tasks layout constants.
-constexpr int kColumnSpacingClamshell = 8;
+constexpr int kColumnInnerSpacingClamshell = 8;
+constexpr int kColumnOuterSpacingClamshell = 6;
 constexpr int kColumnSpacingTablet = 16;
 constexpr int kRowSpacing = 8;
 constexpr size_t kMaxFilesForContinueSection = 4;
@@ -185,16 +186,22 @@ void ContinueTaskContainerView::InitializeTableLayout() {
   table_layout_ = SetLayoutManager(std::make_unique<views::TableLayout>());
   std::vector<size_t> linked_columns;
   for (int i = 0; i < columns_; i++) {
-    if (i > 0) {
+    if (i == 0) {
       table_layout_->AddPaddingColumn(views::TableLayout::kFixedSize,
-                                      kColumnSpacingClamshell);
+                                      kColumnOuterSpacingClamshell);
+    } else {
+      table_layout_->AddPaddingColumn(views::TableLayout::kFixedSize,
+                                      kColumnInnerSpacingClamshell);
     }
     table_layout_->AddColumn(
         views::LayoutAlignment::kStretch, views::LayoutAlignment::kCenter,
         /*horizontal_resize=*/1.0f, views::TableLayout::ColumnSize::kFixed,
         /*fixed_width=*/0, /*min_width=*/0);
-    linked_columns.push_back(2 * i);
+    linked_columns.push_back(2 * i + 1);
   }
+  table_layout_->AddPaddingColumn(views::TableLayout::kFixedSize,
+                                  kColumnOuterSpacingClamshell);
+
   table_layout_->LinkColumnSizes(linked_columns);
   // Continue section only shows if there are 3 or more suggestions, so there
   // are always 2 rows.

diff --git a/ash/capture_mode/capture_mode_unittests.cc b/ash/capture_mode/capture_mode_unittests.cc
@@ -5037,6 +5037,16 @@ TEST_F(ProjectorCaptureModeIntegrationTests,
   EXPECT_FALSE(controller->is_recording_in_progress());
 }
 
+TEST_F(ProjectorCaptureModeIntegrationTests,
+       ProjectorSessionNeverStartsWhenVideoRecordingIsOnGoing) {
+  auto* controller = StartCaptureSession(CaptureModeSource::kFullscreen,
+                                         CaptureModeType::kVideo);
+  controller->StartVideoRecordingImmediatelyForTesting();
+  EXPECT_TRUE(controller->is_recording_in_progress());
+  EXPECT_FALSE(ProjectorSession::Get()->is_active());
+  EXPECT_FALSE(ProjectorController::Get()->CanStartNewSession());
+}
+
 namespace {
 
 enum AbortReason {

diff --git a/ash/capture_mode/video_recording_watcher.cc b/ash/capture_mode/video_recording_watcher.cc
@@ -228,8 +228,9 @@ VideoRecordingWatcher::VideoRecordingWatcher(
     recording_overlay_controller_ =
         std::make_unique<RecordingOverlayController>(window_being_recorded_,
                                                      GetOverlayWidgetBounds());
-    ProjectorControllerImpl::Get()->OnRecordingStarted();
   }
+  if (features::IsProjectorEnabled())
+    ProjectorControllerImpl::Get()->OnRecordingStarted(is_in_projector_mode_);
 }
 
 VideoRecordingWatcher::~VideoRecordingWatcher() {
@@ -254,8 +255,8 @@ void VideoRecordingWatcher::ShutDown() {
   recording_overlay_controller_.reset();
   dimmers_.clear();
 
-  if (is_in_projector_mode_)
-    ProjectorControllerImpl::Get()->OnRecordingEnded();
+  if (features::IsProjectorEnabled())
+    ProjectorControllerImpl::Get()->OnRecordingEnded(is_in_projector_mode_);
 
   window_being_recorded_->RemovePreTargetHandler(this);
   TabletModeController::Get()->RemoveObserver(this);

diff --git a/ash/constants/ash_features.cc b/ash/constants/ash_features.cc
@@ -1220,15 +1220,6 @@ const base::Feature kUseAuthsessionAuthentication{
 const base::Feature kUseBluetoothSystemInAsh{"UseBluetoothSystemInAsh",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Uses the same browser sync consent dialog as Windows/Mac/Linux. Allows the
-// user to fully opt-out of browser sync, including marking the IdentityManager
-// primary account as unconsented. Requires SyncConsentOptional.
-// NOTE: Call UseBrowserSyncConsent() to test the flag, see implementation.
-// TODO(https://crbug.com/1246824) Maybe deprecate the flag in favor of
-// SyncConsentOptional.
-const base::Feature kUseBrowserSyncConsent{"UseBrowserSyncConsent",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Use the staging URL as part of the "Messages" feature under "Connected
 // Devices" settings.
 const base::Feature kUseMessagesStagingUrl{"UseMessagesStagingUrl",
@@ -1905,12 +1896,6 @@ bool ShouldUseAttachApn() {
          base::FeatureList::IsEnabled(kCellularUseAttachApn);
 }
 
-bool ShouldUseBrowserSyncConsent() {
-  // UseBrowserSyncConsent requires SyncConsentOptional.
-  return base::FeatureList::IsEnabled(kSyncConsentOptional) &&
-         base::FeatureList::IsEnabled(kUseBrowserSyncConsent);
-}
-
 bool ShouldUseV1DeviceSync() {
   return !ShouldUseV2DeviceSync() ||
          !base::FeatureList::IsEnabled(kDisableCryptAuthV1DeviceSync);

diff --git a/ash/constants/ash_features.h b/ash/constants/ash_features.h
@@ -461,9 +461,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kUseAuthsessionAuthentication;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kUseBluetoothSystemInAsh;
-// Visible for testing. Call UseBrowserSyncConsent() to check the flag.
-COMPONENT_EXPORT(ASH_CONSTANTS)
-extern const base::Feature kUseBrowserSyncConsent;
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const base::Feature kUseMessagesStagingUrl;
 COMPONENT_EXPORT(ASH_CONSTANTS)
@@ -651,7 +648,6 @@ COMPONENT_EXPORT(ASH_CONSTANTS) bool IsWindowControlMenuEnabled();
 // TODO(michaelpg): Remove after M71 branch to re-enable Play Store by default.
 COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldShowPlayStoreInDemoMode();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldUseAttachApn();
-COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldUseBrowserSyncConsent();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldUseV1DeviceSync();
 COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldUseV2DeviceSync();
 

diff --git a/ash/constants/ash_pref_names.cc b/ash/constants/ash_pref_names.cc
@@ -904,6 +904,10 @@ const char kProjectorGalleryOnboardingShowCount[] =
 const char kProjectorViewerOnboardingShowCount[] =
     "ash.projector.viewerOnboardingShowCount";
 
+// Boolean value for the DeviceLoginScreenWebUILazyLoading device policy.
+const char kLoginScreenWebUILazyLoading[] =
+    "ash.login.LoginScreenWebUILazyLoading";
+
 // NOTE: New prefs should start with the "ash." prefix. Existing prefs moved
 // into this file should not be renamed, since they may be synced.
 

diff --git a/ash/constants/ash_pref_names.h b/ash/constants/ash_pref_names.h
@@ -415,6 +415,9 @@ extern const char kProjectorGalleryOnboardingShowCount[];
 COMPONENT_EXPORT(ASH_CONSTANTS)
 extern const char kProjectorViewerOnboardingShowCount[];
 
+COMPONENT_EXPORT(ASH_CONSTANTS)
+extern const char kLoginScreenWebUILazyLoading[];
+
 }  // namespace prefs
 }  // namespace ash
 

diff --git a/ash/projector/projector_controller_impl.cc b/ash/projector/projector_controller_impl.cc
@@ -160,7 +160,8 @@ bool ProjectorControllerImpl::CanStartNewSession() const {
   // TODO(crbug.com/1165435) Add other pre-conditions to starting a new
   // projector session.
   return IsEligible() && !projector_session_->is_active() &&
-         client_->IsDriveFsMounted();
+         client_->IsDriveFsMounted() &&
+         !CaptureModeController::Get()->is_recording_in_progress();
 }
 
 void ProjectorControllerImpl::OnToolSet(const AnnotatorTool& tool) {
@@ -188,14 +189,18 @@ void ProjectorControllerImpl::MarkKeyIdea() {
   ui_controller_->OnKeyIdeaMarked();
 }
 
-void ProjectorControllerImpl::OnRecordingStarted() {
+void ProjectorControllerImpl::OnRecordingStarted(bool is_in_projector_mode) {
+  if (!is_in_projector_mode)
+    return;
   ui_controller_->ShowToolbar();
   StartSpeechRecognition();
   ui_controller_->OnRecordingStateChanged(true /* started */);
   metadata_controller_->OnRecordingStarted();
 }
 
-void ProjectorControllerImpl::OnRecordingEnded() {
+void ProjectorControllerImpl::OnRecordingEnded(bool is_in_projector_mode) {
+  if (!is_in_projector_mode)
+    return;
   DCHECK(projector_session_->is_active());
 
   StopSpeechRecognition();

diff --git a/ash/projector/projector_controller_impl.h b/ash/projector/projector_controller_impl.h
@@ -73,10 +73,11 @@ class ASH_EXPORT ProjectorControllerImpl : public ProjectorController,
   // Mark a key idea.
   void MarkKeyIdea();
 
-  // Called by Capture Mode to notify with the state of a projector-initiated
-  // video recording.
-  void OnRecordingStarted();
-  void OnRecordingEnded();
+  // Called by Capture Mode to notify with the state of a video recording.
+  // `is_in_projector_mode` indicates whether it's a projector-initiated video
+  // recording.
+  void OnRecordingStarted(bool is_in_projector_mode);
+  void OnRecordingEnded(bool is_in_projector_mode);
 
   // Called by Capture Mode to notify us that a Projector-initiated recording
   // session was aborted (i.e. recording was never started) due to e.g. user

diff --git a/ash/projector/projector_controller_unittest.cc b/ash/projector/projector_controller_unittest.cc
@@ -219,7 +219,7 @@ TEST_F(ProjectorControllerTest, RecordingStarted) {
   // Verify that |CloseToolbar| in |ProjectorUiController| is called.
   EXPECT_CALL(*mock_ui_controller_, ShowToolbar()).Times(1);
 
-  controller_->OnRecordingStarted();
+  controller_->OnRecordingStarted(/*is_in_projector_mode=*/true);
 }
 
 TEST_F(ProjectorControllerTest, RecordingEnded) {
@@ -243,7 +243,7 @@ TEST_F(ProjectorControllerTest, RecordingEnded) {
   base::TimeDelta forward_by = start_time - base::Time::Now();
   task_environment()->AdvanceClock(forward_by);
   controller_->projector_session()->Start("projector_data");
-  controller_->OnRecordingStarted();
+  controller_->OnRecordingStarted(/*is_in_projector_mode=*/true);
 
   base::RunLoop runLoop;
   controller_->CreateScreencastContainerFolder(base::BindLambdaForTesting(
@@ -267,7 +267,7 @@ TEST_F(ProjectorControllerTest, RecordingEnded) {
                                      // Screencast file name without extension.
                                      .Append(expected_screencast_name)));
 
-        controller_->OnRecordingEnded();
+        controller_->OnRecordingEnded(/*is_in_projector_mode=*/true);
         runLoop.Quit();
       }));
 

diff --git a/ash/projector/projector_ui_controller_unittest.cc b/ash/projector/projector_ui_controller_unittest.cc
@@ -276,7 +276,8 @@ TEST_P(ProjectorUiControllerTest, UmaMetricsTest) {
   Shell::Get()->projector_controller()->SetClient(&mock_client);
   Shell::Get()->projector_controller()->OnSpeechRecognitionAvailabilityChanged(
       SpeechRecognitionAvailability::kAvailable);
-  Shell::Get()->projector_controller()->OnRecordingStarted();
+  Shell::Get()->projector_controller()->OnRecordingStarted(
+      /*is_in_projector_mode=*/true);
 
   histogram_tester.ExpectUniqueSample(
       kProjectorToolbarHistogramName,

diff --git a/ash/strings/ash_strings_ar.xtb b/ash/strings/ash_strings_ar.xtb
@@ -35,6 +35,7 @@
 <translation id="1175572348579024023">التمرير</translation>
 <translation id="1178581264944972037">الإيقاف مؤقتًا</translation>
 <translation id="1181037720776840403">إزالة</translation>
+<translation id="118437560755358292">أدخِل كلمة المرور أو رقم التعريف الشخصي لزيادة مستوى الأمان</translation>
 <translation id="118532027333893379">انقر في أي مكان لالتقاط صورة في وضع ملء الشاشة.</translation>
 <translation id="1190609913194133056">مركز الإشعارات</translation>
 <translation id="1190678134285018527">يجب إعادة الجهاز إلى الإصدار السابق</translation>
@@ -339,6 +340,7 @@
 <translation id="3307642347673023554">تمّ التبديل إلى وضع الكمبيوتر المحمول.</translation>
 <translation id="3308453408813785101">سيظل بإمكان <ph name="USER_EMAIL_ADDRESS" /> تسجيل الدخول لاحقًا.</translation>
 <translation id="3321628682574733415">رمز أحد الوالدين غير صحيح</translation>
+<translation id="3339826665088060472">لقطة الشاشة، أدوات التقاط لقطات الشاشة وتسجيلات الشاشة</translation>
 <translation id="3341303451326249809">تم أخذ لقطة الشاشة.</translation>
 <translation id="334252345105450327">التقاط لقطة شاشة</translation>
 <translation id="3351879221545518001">أنت حاليًا تبث محتوى الشاشة.</translation>
@@ -395,6 +397,7 @@
 <translation id="3606978283550408104">تم توصيل شاشة برايل.</translation>
 <translation id="3615926715408477684">سيؤدي تفعيل ميزة بيانات الجوّال إلى تفعيل البلوتوث.</translation>
 <translation id="3616883743181209306">تم نقل القائمة إلى أعلى يسار الشاشة.</translation>
+<translation id="3619536907358025872">إعدادات تصوير الشاشة</translation>
 <translation id="3621202678540785336">الإدخال</translation>
 <translation id="3621712662352432595">إعدادات الصوت</translation>
 <translation id="3626281679859535460">السطوع</translation>
@@ -493,6 +496,7 @@
 <translation id="4269883910223712419">يمتلك مشرف هذا الجهاز القدرة على ما يلي:</translation>
 <translation id="4274537685965975248">‏تم تغيير اختصارات لوحة المفاتيح "Ctrl + Alt + السهم المتّجه للأسفل". لاستخدام مفتاح End، اضغط على المفتاحَين "<ph name="LAUNCHER_KEY_NAME" /> + السهم المتّجه لليمين".</translation>
 <translation id="4279490309300973883">النسخ المطابق</translation>
+<translation id="4283888303416325161">أدخِل كلمة المرور لزيادة مستوى الأمان</translation>
 <translation id="4285498937028063278">إزالة تثبيت</translation>
 <translation id="429402653707266969">تبديل مكان شريط الأدوات</translation>
 <translation id="4294319844246081198">صباح الخير <ph name="GIVEN_NAME" />،</translation>
@@ -762,6 +766,7 @@
 <translation id="607652042414456612">يمكن لأجهزة بلوتوث القريبة اكتشاف جهاز الكمبيوتر وسيظهر كـ "<ph name="NAME" />" بالعنوان <ph name="ADDRESS" /></translation>
 <translation id="6114505516289286752">تم تنزيل ملفات اللغة <ph name="LANGUAGE" /> في ميزة "التعرّف على الكلام"</translation>
 <translation id="6119360623251949462"><ph name="CHARGING_STATE" />. <ph name="BATTERY_SAVER_STATE" /></translation>
+<translation id="6121838516699723042">تأكيد تنزيل <ph name="FILENAME" /></translation>
 <translation id="612734058257491180">‏لا يتوفر "مساعد Google" في جلسة ضيف.</translation>
 <translation id="6134259848159370930">يمكنك البحث في الجهاز والتطبيقات والإعدادات والويب.</translation>
 <translation id="6137566720514957455">فتح مربع الحوار لإزالة الحساب <ph name="USER_EMAIL_ADDRESS" /></translation>