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

The nested namespace ash::tray is used inconsistently. The majority of code is in namespace ash. Remove some usage of namespace tray. This fixes most classes other than a11y, network, and bluetooth. Those will be done in follow-up CLs, to keep the CLs small. No behavior changes, just cleanup. Bug: none Change-Id: I50b9d1696532e4ec441aff434635bce0d29427b2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3566441 Reviewed-by: Alex Newcomer <newcomer@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/main@{#988175}
chromium · Apr 1, 2022 · 8f37fb3 · 8f37fb3
1 parent f8233ca
commit 8f37fb3
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 107 deletions.
diff --git a/ash/ambient/ui/glanceable_info_view.cc b/ash/ambient/ui/glanceable_info_view.cc
@@ -154,9 +154,9 @@ void GlanceableInfoView::InitLayout() {
       gfx::ShadowValue::GetMargin(ambient::util::GetTextShadowValues(nullptr));
 
   // Inits the time view.
-  time_view_ = AddChildView(std::make_unique<tray::TimeView>(
-      ash::tray::TimeView::ClockLayout::HORIZONTAL_CLOCK,
-      Shell::Get()->system_tray_model()->clock()));
+  time_view_ = AddChildView(
+      std::make_unique<TimeView>(TimeView::ClockLayout::HORIZONTAL_CLOCK,
+                                 Shell::Get()->system_tray_model()->clock()));
   gfx::FontList time_font_list = GetTimeFontList(time_font_size_dip_);
   time_view_->SetTextFont(time_font_list);
   time_view_->SetTextColor(time_temperature_font_color_,

diff --git a/ash/ambient/ui/glanceable_info_view.h b/ash/ambient/ui/glanceable_info_view.h
@@ -18,11 +18,8 @@ class Label;
 
 namespace ash {
 
-namespace tray {
-class TimeView;
-}
-
 class AmbientViewDelegate;
+class TimeView;
 
 // Container for displaying a glanceable clock and weather info.
 class GlanceableInfoView : public views::View,
@@ -51,7 +48,7 @@ class GlanceableInfoView : public views::View,
   std::u16string GetTemperatureText() const;
 
   // View for the time info. Owned by the view hierarchy.
-  ash::tray::TimeView* time_view_ = nullptr;
+  TimeView* time_view_ = nullptr;
 
   // Views for weather icon and temperature.
   views::ImageView* weather_condition_icon_ = nullptr;

diff --git a/ash/system/audio/audio_detailed_view.cc b/ash/system/audio/audio_detailed_view.cc
@@ -42,7 +42,7 @@ constexpr auto kToggleButtonRowLabelPadding = gfx::Insets::TLBR(16, 0, 15, 0);
 constexpr auto kToggleButtonRowViewPadding = gfx::Insets::TLBR(0, 56, 8, 0);
 
 // This callback is only used for tests.
-tray::AudioDetailedView::NoiseCancellationCallback*
+AudioDetailedView::NoiseCancellationCallback*
     g_noise_cancellation_toggle_callback = nullptr;
 
 std::u16string GetAudioDeviceName(const AudioDevice& device) {
@@ -90,8 +90,6 @@ speech::LanguageCode GetLiveCaptionLocale() {
 
 }  // namespace
 
-namespace tray {
-
 AudioDetailedView::AudioDetailedView(DetailedViewDelegate* delegate)
     : TrayDetailedView(delegate) {
   CreateItems();
@@ -391,5 +389,4 @@ void AudioDetailedView::MaybeShowSodaMessage(speech::LanguageCode language_code,
   }
 }
 
-}  // namespace tray
 }  // namespace ash
diff --git a/ash/system/audio/audio_detailed_view.h b/ash/system/audio/audio_detailed_view.h
@@ -27,10 +27,8 @@ class MicGainSliderController;
 class UnifiedAudioDetailedViewControllerSodaTest;
 class UnifiedAudioDetailedViewControllerTest;
 
-namespace tray {
-
 class ASH_EXPORT AudioDetailedView : public TrayDetailedView,
-                                     public ::ash::AccessibilityObserver,
+                                     public AccessibilityObserver,
                                      public speech::SodaInstaller::Observer {
  public:
   explicit AudioDetailedView(DetailedViewDelegate* delegate);
@@ -50,12 +48,12 @@ class ASH_EXPORT AudioDetailedView : public TrayDetailedView,
   static void SetMapNoiseCancellationToggleCallbackForTest(
       NoiseCancellationCallback* map_noise_cancellation_toggle_callback);
 
-  // ::ash::AccessibilityObserver:
+  // AccessibilityObserver:
   void OnAccessibilityStatusChanged() override;
 
  private:
-  friend class ::ash::UnifiedAudioDetailedViewControllerSodaTest;
-  friend class ::ash::UnifiedAudioDetailedViewControllerTest;
+  friend class UnifiedAudioDetailedViewControllerSodaTest;
+  friend class UnifiedAudioDetailedViewControllerTest;
 
   // Helper function to add non-clickable header rows within the scrollable
   // list.
@@ -93,7 +91,6 @@ class ASH_EXPORT AudioDetailedView : public TrayDetailedView,
   HoverHighlightView* live_caption_view_ = nullptr;
 };
 
-}  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_AUDIO_AUDIO_DETAILED_VIEW_H_
diff --git a/ash/system/audio/unified_audio_detailed_view_controller.cc b/ash/system/audio/unified_audio_detailed_view_controller.cc
@@ -25,7 +25,7 @@ UnifiedAudioDetailedViewController::~UnifiedAudioDetailedViewController() {
 
 views::View* UnifiedAudioDetailedViewController::CreateView() {
   DCHECK(!view_);
-  view_ = new tray::AudioDetailedView(detailed_view_delegate_.get());
+  view_ = new AudioDetailedView(detailed_view_delegate_.get());
   view_->Update();
   return view_;
 }

diff --git a/ash/system/audio/unified_audio_detailed_view_controller.h b/ash/system/audio/unified_audio_detailed_view_controller.h
@@ -13,10 +13,7 @@
 
 namespace ash {
 
-namespace tray {
 class AudioDetailedView;
-}  // namespace tray
-
 class DetailedViewDelegate;
 class UnifiedSystemTrayController;
 
@@ -47,7 +44,7 @@ class ASH_EXPORT UnifiedAudioDetailedViewController
  private:
   const std::unique_ptr<DetailedViewDelegate> detailed_view_delegate_;
 
-  tray::AudioDetailedView* view_ = nullptr;
+  AudioDetailedView* view_ = nullptr;
 };
 
 }  // namespace ash

diff --git a/ash/system/audio/unified_audio_detailed_view_controller_unittest.cc b/ash/system/audio/unified_audio_detailed_view_controller_unittest.cc
@@ -139,7 +139,7 @@ class UnifiedAudioDetailedViewControllerTest : public AshTestBase {
         base::BindRepeating(&UnifiedAudioDetailedViewControllerTest::
                                 AddViewToNoiseCancellationToggleMap,
                             base::Unretained(this));
-    tray::AudioDetailedView::SetMapNoiseCancellationToggleCallbackForTest(
+    AudioDetailedView::SetMapNoiseCancellationToggleCallbackForTest(
         &noise_cancellation_toggle_callback_);
   }
 
@@ -173,11 +173,10 @@ class UnifiedAudioDetailedViewControllerTest : public AshTestBase {
     return chromeos::FakeCrasAudioClient::Get();
   }
 
-  tray::AudioDetailedView* audio_detailed_view() {
+  AudioDetailedView* audio_detailed_view() {
     if (!audio_detailed_view_) {
-      audio_detailed_view_ =
-          base::WrapUnique(static_cast<tray::AudioDetailedView*>(
-              audio_detailed_view_controller_->CreateView()));
+      audio_detailed_view_ = base::WrapUnique(static_cast<AudioDetailedView*>(
+          audio_detailed_view_controller_->CreateView()));
     }
     return audio_detailed_view_.get();
   }
@@ -193,7 +192,7 @@ class UnifiedAudioDetailedViewControllerTest : public AshTestBase {
   std::map<uint64_t, views::View*> sliders_map_;
   std::map<uint64_t, views::View*> toggles_map_;
   MicGainSliderController::MapDeviceSliderCallback map_device_sliders_callback_;
-  tray::AudioDetailedView::NoiseCancellationCallback
+  AudioDetailedView::NoiseCancellationCallback
       noise_cancellation_toggle_callback_;
   CrasAudioHandler* cras_audio_handler_ = nullptr;  // Not owned.
   scoped_refptr<AudioDevicesPrefHandlerStub> audio_pref_handler_;
@@ -202,7 +201,7 @@ class UnifiedAudioDetailedViewControllerTest : public AshTestBase {
   scoped_refptr<UnifiedSystemTrayModel> tray_model_;
   std::unique_ptr<UnifiedSystemTrayController> tray_controller_;
   base::test::ScopedFeatureList scoped_feature_list_;
-  std::unique_ptr<tray::AudioDetailedView> audio_detailed_view_;
+  std::unique_ptr<AudioDetailedView> audio_detailed_view_;
 };
 
 TEST_F(UnifiedAudioDetailedViewControllerTest, OnlyOneVisibleSlider) {

diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
@@ -61,8 +61,6 @@ const gfx::VectorIcon& SinkIconTypeToIcon(SinkIconType icon_type) {
 
 }  // namespace
 
-namespace tray {
-
 CastDetailedView::CastDetailedView(DetailedViewDelegate* delegate)
     : TrayDetailedView(delegate) {
   CreateItems();
@@ -148,5 +146,4 @@ void CastDetailedView::HandleViewClicked(views::View* view) {
   }
 }
 
-}  // namespace tray
 }  // namespace ash
diff --git a/ash/system/cast/tray_cast.h b/ash/system/cast/tray_cast.h
@@ -12,7 +12,6 @@
 #include "ash/system/tray/tray_detailed_view.h"
 
 namespace ash {
-namespace tray {
 
 // This view displays a list of cast receivers that can be clicked on and casted
 // to. It is activated by clicking on the chevron inside of
@@ -50,7 +49,6 @@ class CastDetailedView : public TrayDetailedView,
   views::View* add_access_code_device_ = nullptr;
 };
 
-}  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_CAST_TRAY_CAST_H_
diff --git a/ash/system/cast/unified_cast_detailed_view_controller.cc b/ash/system/cast/unified_cast_detailed_view_controller.cc
@@ -22,7 +22,7 @@ UnifiedCastDetailedViewController::~UnifiedCastDetailedViewController() =
 
 views::View* UnifiedCastDetailedViewController::CreateView() {
   DCHECK(!view_);
-  view_ = new tray::CastDetailedView(detailed_view_delegate_.get());
+  view_ = new CastDetailedView(detailed_view_delegate_.get());
   return view_;
 }
 

diff --git a/ash/system/cast/unified_cast_detailed_view_controller.h b/ash/system/cast/unified_cast_detailed_view_controller.h
@@ -9,10 +9,8 @@
 #include "ash/system/unified/detailed_view_controller.h"
 
 namespace ash {
-namespace tray {
-class CastDetailedView;
-}  // namespace tray
 
+class CastDetailedView;
 class DetailedViewDelegate;
 class UnifiedSystemTrayController;
 
@@ -36,7 +34,7 @@ class UnifiedCastDetailedViewController : public DetailedViewController {
  private:
   const std::unique_ptr<DetailedViewDelegate> detailed_view_delegate_;
 
-  tray::CastDetailedView* view_ = nullptr;
+  CastDetailedView* view_ = nullptr;
 };
 
 }  // namespace ash

diff --git a/ash/system/ime/tray_ime_chromeos.cc b/ash/system/ime/tray_ime_chromeos.cc
@@ -30,8 +30,6 @@
 
 namespace ash {
 
-namespace tray {
-
 IMEDetailedView::IMEDetailedView(DetailedViewDelegate* delegate,
                                  ImeControllerImpl* ime_controller)
     : ImeListView(delegate), ime_controller_(ime_controller) {
@@ -83,6 +81,4 @@ void IMEDetailedView::ShowSettings() {
 BEGIN_METADATA(IMEDetailedView, ImeListView)
 END_METADATA
 
-}  // namespace tray
-
 }  // namespace ash
diff --git a/ash/system/ime/tray_ime_chromeos.h b/ash/system/ime/tray_ime_chromeos.h
@@ -18,8 +18,6 @@ class ImageView;
 namespace ash {
 class ImeControllerImpl;
 
-namespace tray {
-
 // A list of available IMEs shown in the IME detailed view of the system menu,
 // along with other items in the title row (a settings button and optional
 // enterprise-controlled icon).
@@ -58,8 +56,6 @@ class IMEDetailedView : public ImeListView {
   views::ImageView* controlled_setting_icon_ = nullptr;
 };
 
-}  // namespace tray
-
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
diff --git a/ash/system/ime/unified_ime_detailed_view_controller.cc b/ash/system/ime/unified_ime_detailed_view_controller.cc
@@ -42,8 +42,8 @@ UnifiedIMEDetailedViewController::~UnifiedIMEDetailedViewController() {
 
 views::View* UnifiedIMEDetailedViewController::CreateView() {
   DCHECK(!view_);
-  view_ = new tray::IMEDetailedView(detailed_view_delegate_.get(),
-                                    Shell::Get()->ime_controller());
+  view_ = new IMEDetailedView(detailed_view_delegate_.get(),
+                              Shell::Get()->ime_controller());
   view_->Init(ShouldShowKeyboardToggle(), GetSingleImeBehavior());
   return view_;
 }

diff --git a/ash/system/ime/unified_ime_detailed_view_controller.h b/ash/system/ime/unified_ime_detailed_view_controller.h
@@ -13,11 +13,9 @@
 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"
 
 namespace ash {
-namespace tray {
-class IMEDetailedView;
-}  // namespace tray
 
 class DetailedViewDelegate;
+class IMEDetailedView;
 class UnifiedSystemTrayController;
 
 // Controller of IME detailed view in UnifiedSystemTray.
@@ -57,7 +55,7 @@ class UnifiedIMEDetailedViewController : public DetailedViewController,
 
   const std::unique_ptr<DetailedViewDelegate> detailed_view_delegate_;
 
-  tray::IMEDetailedView* view_ = nullptr;
+  IMEDetailedView* view_ = nullptr;
 
   bool keyboard_suppressed_ = false;
 };

diff --git a/ash/system/locale/locale_detailed_view.cc b/ash/system/locale/locale_detailed_view.cc
@@ -40,7 +40,7 @@ class LocaleItem : public ActionableView {
  public:
   METADATA_HEADER(LocaleItem);
 
-  LocaleItem(tray::LocaleDetailedView* locale_detailed_view,
+  LocaleItem(LocaleDetailedView* locale_detailed_view,
              const std::string& iso_code,
              const std::u16string& display_name,
              bool checked)
@@ -109,7 +109,7 @@ class LocaleItem : public ActionableView {
   }
 
  private:
-  tray::LocaleDetailedView* locale_detailed_view_;
+  LocaleDetailedView* locale_detailed_view_;
   const bool checked_;
 };
 
@@ -118,8 +118,6 @@ END_METADATA
 
 }  // namespace
 
-namespace tray {
-
 LocaleDetailedView::LocaleDetailedView(DetailedViewDelegate* delegate)
     : TrayDetailedView(delegate) {
   CreateItems();
@@ -162,5 +160,4 @@ void LocaleDetailedView::HandleViewClicked(views::View* view) {
 BEGIN_METADATA(LocaleDetailedView, TrayDetailedView)
 END_METADATA
 
-}  // namespace tray
 }  // namespace ash
diff --git a/ash/system/locale/locale_detailed_view.h b/ash/system/locale/locale_detailed_view.h
@@ -12,7 +12,6 @@
 #include "ui/base/metadata/metadata_header_macros.h"
 
 namespace ash {
-namespace tray {
 
 // The detailed view to show when the locale feature button is clicked.
 class LocaleDetailedView : public TrayDetailedView {
@@ -34,7 +33,6 @@ class LocaleDetailedView : public TrayDetailedView {
   base::flat_map<int, std::string> id_to_locale_;
 };
 
-}  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_LOCALE_LOCALE_DETAILED_VIEW_H_
diff --git a/ash/system/locale/unified_locale_detailed_view_controller.cc b/ash/system/locale/unified_locale_detailed_view_controller.cc
@@ -22,7 +22,7 @@ UnifiedLocaleDetailedViewController::~UnifiedLocaleDetailedViewController() =
 
 views::View* UnifiedLocaleDetailedViewController::CreateView() {
   DCHECK(!view_);
-  view_ = new tray::LocaleDetailedView(detailed_view_delegate_.get());
+  view_ = new LocaleDetailedView(detailed_view_delegate_.get());
   return view_;
 }
 

diff --git a/ash/system/locale/unified_locale_detailed_view_controller.h b/ash/system/locale/unified_locale_detailed_view_controller.h
@@ -11,11 +11,8 @@
 
 namespace ash {
 
-namespace tray {
-class LocaleDetailedView;
-}  // namespace tray
-
 class DetailedViewDelegate;
+class LocaleDetailedView;
 class UnifiedSystemTrayController;
 
 // Controller of the locale detailed view in UnifiedSystemTray.
@@ -38,7 +35,7 @@ class UnifiedLocaleDetailedViewController : public DetailedViewController {
  private:
   const std::unique_ptr<DetailedViewDelegate> detailed_view_delegate_;
 
-  tray::LocaleDetailedView* view_ = nullptr;
+  LocaleDetailedView* view_ = nullptr;
 };
 
 }  // namespace ash

diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
@@ -40,8 +40,6 @@ using message_center::Notification;
 
 namespace ash {
 
-namespace tray {
-
 PowerTrayView::PowerTrayView(Shelf* shelf) : TrayItemView(shelf) {
   CreateImageView();
   UpdateStatus();
@@ -130,5 +128,4 @@ void PowerTrayView::UpdateImage(bool icon_color_changed) {
       info, kUnifiedTrayBatteryIconSize, icon_bg_color, icon_fg_color));
 }
 
-}  // namespace tray
 }  // namespace ash