Eliminate usage of "namespace tray" in //ash/system/accessibility

The nested namespace ash::tray is used inconsistently. The majority of code is just in namespace ash. Remove the nested namespace in the accessibility code. Simplify some ::ash:: and enums along the way. No behavior changes, just cleanup. Bug: none Change-Id: Idfce87c47705ac30daf511a0f5b08839acf9eff5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565495 Reviewed-by: Alex Newcomer <newcomer@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/main@{#988184}
chromium · Apr 1, 2022 · fd75ec4 · fd75ec4
1 parent ed8d614
commit fd75ec4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 38 deletions.
diff --git a/ash/system/accessibility/floating_accessibility_detailed_controller.cc b/ash/system/accessibility/floating_accessibility_detailed_controller.cc
@@ -85,7 +85,7 @@ void FloatingAccessibilityDetailedController::Show(
   bubble_view_->SetArrowWithoutResizing(alignment);
 
   detailed_view_ = bubble_view_->AddChildView(
-      std::make_unique<tray::AccessibilityDetailedView>(this));
+      std::make_unique<AccessibilityDetailedView>(this));
   bubble_view_->SetPreferredSize(
       gfx::Size(kTrayMenuWidth, kDetailedViewHeightDip));
   bubble_view_->SetFocusBehavior(ActionableView::FocusBehavior::ALWAYS);

diff --git a/ash/system/accessibility/floating_accessibility_detailed_controller.h b/ash/system/accessibility/floating_accessibility_detailed_controller.h
@@ -13,9 +13,7 @@
 
 namespace ash {
 
-namespace tray {
 class AccessibilityDetailedView;
-}
 
 // Controller for the detailed view of accessibility floating menu.
 class ASH_EXPORT FloatingAccessibilityDetailedController
@@ -61,7 +59,7 @@ class ASH_EXPORT FloatingAccessibilityDetailedController
 
   DetailedBubbleView* bubble_view_ = nullptr;
   views::Widget* bubble_widget_ = nullptr;
-  tray::AccessibilityDetailedView* detailed_view_ = nullptr;
+  AccessibilityDetailedView* detailed_view_ = nullptr;
 
   Delegate* const delegate_;  // Owns us.
 };

diff --git a/ash/system/accessibility/tray_accessibility.cc b/ash/system/accessibility/tray_accessibility.cc
@@ -38,8 +38,6 @@
 #include "ui/views/controls/separator.h"
 
 namespace ash {
-namespace tray {
-
 namespace {
 
 using ml::UserSettingsEvent;
@@ -681,5 +679,4 @@ void AccessibilityDetailedView::SetSodaFeatureSubtext(SodaFeature feature,
   }
 }
 
-}  // namespace tray
 }  // namespace ash
diff --git a/ash/system/accessibility/tray_accessibility.h b/ash/system/accessibility/tray_accessibility.h
@@ -33,8 +33,6 @@ class TrayAccessibilityLoginScreenTest;
 class TrayAccessibilitySodaTest;
 class TrayAccessibilityTest;
 
-namespace tray {
-
 enum class SodaFeature {
   kDictation,
   kLiveCaption,
@@ -61,9 +59,9 @@ class ASH_EXPORT AccessibilityDetailedView
   const char* GetClassName() const override;
 
  private:
-  friend class ::ash::TrayAccessibilityLoginScreenTest;
-  friend class ::ash::TrayAccessibilitySodaTest;
-  friend class ::ash::TrayAccessibilityTest;
+  friend class TrayAccessibilityLoginScreenTest;
+  friend class TrayAccessibilitySodaTest;
+  friend class TrayAccessibilityTest;
   friend class chromeos::TrayAccessibilityTest;
 
   // TrayDetailedView:
@@ -133,7 +131,6 @@ class ASH_EXPORT AccessibilityDetailedView
   LoginStatus login_;
 };
 
-}  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_ACCESSIBILITY_TRAY_ACCESSIBILITY_H_
diff --git a/ash/system/accessibility/tray_accessibility_unittest.cc b/ash/system/accessibility/tray_accessibility_unittest.cc
@@ -144,7 +144,7 @@ class TrayAccessibilityTest : public AshTestBase, public AccessibilityObserver {
   void CreateDetailedMenu() {
     delegate_ = std::make_unique<DetailedViewDelegate>(nullptr);
     detailed_menu_ =
-        std::make_unique<tray::AccessibilityDetailedView>(delegate_.get());
+        std::make_unique<AccessibilityDetailedView>(delegate_.get());
   }
 
   void CloseDetailMenu() {
@@ -405,9 +405,7 @@ class TrayAccessibilityTest : public AshTestBase, public AccessibilityObserver {
     return detailed_menu_->GetClassName();
   }
 
-  tray::AccessibilityDetailedView* detailed_menu() {
-    return detailed_menu_.get();
-  }
+  AccessibilityDetailedView* detailed_menu() { return detailed_menu_.get(); }
 
  private:
   // AccessibilityObserver:
@@ -420,7 +418,7 @@ class TrayAccessibilityTest : public AshTestBase, public AccessibilityObserver {
   }
 
   std::unique_ptr<DetailedViewDelegate> delegate_;
-  std::unique_ptr<tray::AccessibilityDetailedView> detailed_menu_;
+  std::unique_ptr<AccessibilityDetailedView> detailed_menu_;
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
@@ -680,15 +678,9 @@ TEST_F(TrayAccessibilityTest, ClickDetailMenu) {
 // Trivial test to increase code coverage.
 TEST_F(TrayAccessibilityTest, GetClassName) {
   CreateDetailedMenu();
-  EXPECT_EQ(tray::AccessibilityDetailedView::kClassName,
-            GetDetailedViewClassName());
+  EXPECT_EQ(AccessibilityDetailedView::kClassName, GetDetailedViewClassName());
 }
 
-enum SodaFeature {
-  kDictation,
-  kLiveCaption,
-};
-
 class TrayAccessibilitySodaTest
     : public TrayAccessibilityTest,
       public testing::WithParamInterface<SodaFeature> {
@@ -726,22 +718,22 @@ class TrayAccessibilitySodaTest
 
   void EnableFeature(bool enabled) {
     switch (GetParam()) {
-      case kDictation:
+      case SodaFeature::kDictation:
         EnableDictation(enabled);
         break;
-      case kLiveCaption:
+      case SodaFeature::kLiveCaption:
         EnableLiveCaption(enabled);
         break;
     }
   }
 
   void SetFeatureLocale(const std::string& locale) {
     switch (GetParam()) {
-      case kDictation:
+      case SodaFeature::kDictation:
         Shell::Get()->session_controller()->GetActivePrefService()->SetString(
             prefs::kAccessibilityDictationLocale, locale);
         break;
-      case kLiveCaption:
+      case SodaFeature::kLiveCaption:
         Shell::Get()->session_controller()->GetActivePrefService()->SetString(
             ::prefs::kLiveCaptionLanguageCode, locale);
         break;
@@ -754,20 +746,20 @@ class TrayAccessibilitySodaTest
 
   void SetFeatureViewSubtitleText(std::u16string text) {
     switch (GetParam()) {
-      case kDictation:
+      case SodaFeature::kDictation:
         detailed_menu()->dictation_view_->SetSubText(text);
         break;
-      case kLiveCaption:
+      case SodaFeature::kLiveCaption:
         detailed_menu()->live_caption_view_->SetSubText(text);
         break;
     }
   }
 
   std::u16string GetFeatureViewSubtitleText() {
     switch (GetParam()) {
-      case kDictation:
+      case SodaFeature::kDictation:
         return detailed_menu()->dictation_view_->sub_text_label()->GetText();
-      case kLiveCaption:
+      case SodaFeature::kLiveCaption:
         return detailed_menu()->live_caption_view_->sub_text_label()->GetText();
     }
   }

diff --git a/ash/system/accessibility/unified_accessibility_detailed_view_controller.cc b/ash/system/accessibility/unified_accessibility_detailed_view_controller.cc
@@ -28,7 +28,7 @@ UnifiedAccessibilityDetailedViewController::
 
 views::View* UnifiedAccessibilityDetailedViewController::CreateView() {
   DCHECK(!view_);
-  view_ = new tray::AccessibilityDetailedView(detailed_view_delegate_.get());
+  view_ = new AccessibilityDetailedView(detailed_view_delegate_.get());
   return view_;
 }
 

diff --git a/ash/system/accessibility/unified_accessibility_detailed_view_controller.h b/ash/system/accessibility/unified_accessibility_detailed_view_controller.h
@@ -12,10 +12,7 @@
 
 namespace ash {
 
-namespace tray {
 class AccessibilityDetailedView;
-}  // namespace tray
-
 class DetailedViewDelegate;
 class UnifiedSystemTrayController;
 
@@ -44,7 +41,7 @@ class UnifiedAccessibilityDetailedViewController
  private:
   const std::unique_ptr<DetailedViewDelegate> detailed_view_delegate_;
 
-  tray::AccessibilityDetailedView* view_ = nullptr;
+  AccessibilityDetailedView* view_ = nullptr;
 };
 
 }  // namespace ash