Rename TrayDetailsView to TrayDetailedView.

This CL renames TrayDetailsView to TrayDetailedView, as in other places
it's always called "detailed view" e.g. CreateDetailedView(),
NetworkStateListDetailedView, CastDetailedView,
AccessibilityDetailedView, etc.

TEST=ash_unittests
BUG=none

Change-Id: I84bc2fc7ade4bc71d9907427c35501f21f9da3a6
Reviewed-on: https://chromium-review.googlesource.com/1068888Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560870}

ash/BUILD.gn

@@ -844,8 +844,8 @@ component("ash") {
     "system/tray/tray_constants.h",
     "system/tray/tray_container.cc",
     "system/tray/tray_container.h",
-    "system/tray/tray_details_view.cc",
-    "system/tray/tray_details_view.h",
+    "system/tray/tray_detailed_view.cc",
+    "system/tray/tray_detailed_view.h",
     "system/tray/tray_event_filter.cc",
     "system/tray/tray_event_filter.h",
     "system/tray/tray_image_item.cc",
@@ -1772,7 +1772,7 @@ test("ash_unittests") {
     "system/tracing_notification_controller_unittest.cc",
     "system/tray/size_range_layout_unittest.cc",
     "system/tray/system_tray_unittest.cc",
-    "system/tray/tray_details_view_unittest.cc",
+    "system/tray/tray_detailed_view_unittest.cc",
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",

ash/system/audio/audio_detailed_view.cc

@@ -58,7 +58,7 @@ namespace ash {
 namespace tray {
 
 AudioDetailedView::AudioDetailedView(SystemTrayItem* owner)
-    : TrayDetailsView(owner) {
+    : TrayDetailedView(owner) {
   CreateItems();
   Update();
 }

ash/system/audio/audio_detailed_view.h

@@ -7,7 +7,7 @@
 
 #include <map>
 
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "base/macros.h"
 #include "chromeos/audio/audio_device.h"
 
@@ -18,7 +18,7 @@ struct VectorIcon;
 namespace ash {
 namespace tray {
 
-class AudioDetailedView : public TrayDetailsView {
+class AudioDetailedView : public TrayDetailedView {
  public:
   explicit AudioDetailedView(SystemTrayItem* owner);
 
@@ -36,7 +36,7 @@ class AudioDetailedView : public TrayDetailsView {
   void UpdateScrollableList();
   void UpdateAudioDevices();
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
 
   typedef std::map<views::View*, chromeos::AudioDevice> AudioDeviceMap;

ash/system/bluetooth/tray_bluetooth.cc

@@ -21,7 +21,7 @@
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_info_label.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_popup_item_style.h"
@@ -183,10 +183,10 @@ class BluetoothDefaultView : public TrayItemMore {
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
-class BluetoothDetailedView : public TrayDetailsView {
+class BluetoothDetailedView : public TrayDetailedView {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login)
-      : TrayDetailsView(owner),
+      : TrayDetailedView(owner),
         login_(login),
         toggle_(nullptr),
         settings_(nullptr),
@@ -379,7 +379,7 @@ class BluetoothDetailedView : public TrayDetailsView {
     }
   }
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override {
     TrayBluetoothHelper* helper = Shell::Get()->tray_bluetooth_helper();
     if (!helper->GetBluetoothEnabled())

ash/system/cast/tray_cast.cc

@@ -18,7 +18,7 @@
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "base/strings/utf_string_conversions.h"
@@ -334,7 +334,7 @@ CastTrayView::~CastTrayView() = default;
 // 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
 // |CastSelectDefaultView|.
-class CastDetailedView : public TrayDetailsView {
+class CastDetailedView : public TrayDetailedView {
  public:
   CastDetailedView(SystemTrayItem* owner,
                    const std::vector<mojom::SinkAndRoutePtr>& sinks_and_routes);
@@ -353,7 +353,7 @@ class CastDetailedView : public TrayDetailsView {
 
   void UpdateReceiverListFromCachedData();
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
 
   // A mapping from the receiver id to the receiver/activity data.
@@ -367,7 +367,7 @@ class CastDetailedView : public TrayDetailsView {
 CastDetailedView::CastDetailedView(
     SystemTrayItem* owner,
     const std::vector<mojom::SinkAndRoutePtr>& sinks_routes)
-    : TrayDetailsView(owner) {
+    : TrayDetailedView(owner) {
   CreateItems();
   UpdateReceiverList(sinks_routes);
 }

ash/system/display_scale/scale_detailed_view.cc

@@ -32,7 +32,7 @@ bool IsSameScaleFactor(double new_value) {
 }  // namespace
 
 ScaleDetailedView::ScaleDetailedView(SystemTrayItem* owner)
-    : TrayDetailsView(owner) {
+    : TrayDetailedView(owner) {
   CreateScrollableList();
   CreateTitleRow(IDS_ASH_STATUS_TRAY_SCALE);
   UpdateScrollableList();

ash/system/display_scale/scale_detailed_view.h

@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_DISPLAY_SCALE_SCALE_DETAILED_VIEW_H_
 #define ASH_SYSTEM_DISPLAY_SCALE_SCALE_DETAILED_VIEW_H_
 
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "base/macros.h"
 
 namespace views {
@@ -17,7 +17,7 @@ class HoverHighlightView;
 
 namespace tray {
 
-class ScaleDetailedView : public TrayDetailsView {
+class ScaleDetailedView : public TrayDetailedView {
  public:
   explicit ScaleDetailedView(SystemTrayItem* owner);
 
@@ -30,7 +30,7 @@ class ScaleDetailedView : public TrayDetailsView {
 
   void UpdateScrollableList();
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
 
   std::map<views::View*, double> view_to_scale_;

ash/system/ime/tray_ime_chromeos.cc

@@ -16,7 +16,7 @@
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_popup_item_style.h"

ash/system/ime_menu/ime_list_view.cc

@@ -14,7 +14,7 @@
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
@@ -182,7 +182,7 @@ class KeyboardStatusRow : public views::View {
 };
 
 ImeListView::ImeListView(SystemTrayItem* owner)
-    : TrayDetailsView(owner),
+    : TrayDetailedView(owner),
       last_item_selected_with_keyboard_(false),
       should_focus_ime_after_selection_with_keyboard_(false),
       current_ime_view_(nullptr) {}

ash/system/ime_menu/ime_list_view.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ui/views/controls/button/button.h"
 
 namespace ash {
@@ -23,7 +23,7 @@ class KeyboardStatusRow;
 // Base class used to represent a selecatable list of available IMEs.
 // Optionally shows a toggle which is used to enable or disable the invocation
 // of the virtual keyboard.
-class ImeListView : public TrayDetailsView {
+class ImeListView : public TrayDetailedView {
  public:
   enum SingleImeBehavior {
     // Shows the IME menu if there's only one IME in system.
@@ -69,7 +69,7 @@ class ImeListView : public TrayDetailsView {
     return should_focus_ime_after_selection_with_keyboard_;
   }
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override;

ash/system/network/network_state_list_detailed_view.cc

@@ -173,7 +173,7 @@ NetworkStateListDetailedView::NetworkStateListDetailedView(
     SystemTrayItem* owner,
     ListType list_type,
     LoginStatus login)
-    : TrayDetailsView(owner),
+    : TrayDetailedView(owner),
       list_type_(list_type),
       login_(login),
       info_button_(nullptr),

ash/system/network/network_state_list_detailed_view.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ash/login_status.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 
@@ -23,7 +23,7 @@ namespace tray {
 
 // Exported for tests.
 class ASH_EXPORT NetworkStateListDetailedView
-    : public TrayDetailsView,
+    : public TrayDetailedView,
       public base::SupportsWeakPtr<NetworkStateListDetailedView> {
  public:
   ~NetworkStateListDetailedView() override;
@@ -54,7 +54,7 @@ class ASH_EXPORT NetworkStateListDetailedView
  private:
   class InfoBubble;
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override;

ash/system/tray/tray_details_view.cc → ash/system/tray/tray_detailed_view.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 "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/public/cpp/ash_features.h"
@@ -166,9 +166,8 @@ class ScrollContentsView : public views::View {
         previous_header = &header;
         header_view->SetY(header.natural_offset);
       } else {
-        if (previous_header &&
-            previous_header->view->y() <=
-                scroll_offset + header_view->height()) {
+        if (previous_header && previous_header->view->y() <=
+                                   scroll_offset + header_view->height()) {
           // Lower header displacing the header above.
           draw_separator_below = true;
           header_view->SetY(previous_header->view->y() - header_view->height());
@@ -239,11 +238,10 @@ const int kTitleRowPaddingBottom =
 
 }  // namespace
 
-
 ////////////////////////////////////////////////////////////////////////////////
-// TrayDetailsView:
+// TrayDetailedView:
 
-TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
+TrayDetailedView::TrayDetailedView(SystemTrayItem* owner)
     : owner_(owner),
       box_layout_(nullptr),
       scroller_(nullptr),
@@ -259,14 +257,14 @@ TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
                           this, ui::NativeTheme::kColorId_BubbleBackground));
 }
 
-TrayDetailsView::~TrayDetailsView() = default;
+TrayDetailedView::~TrayDetailedView() = default;
 
-void TrayDetailsView::OnViewClicked(views::View* sender) {
+void TrayDetailedView::OnViewClicked(views::View* sender) {
   HandleViewClicked(sender);
 }
 
-void TrayDetailsView::ButtonPressed(views::Button* sender,
-                                    const ui::Event& event) {
+void TrayDetailedView::ButtonPressed(views::Button* sender,
+                                     const ui::Event& event) {
   if (sender == back_button_) {
     TransitionToDefaultView();
     return;
@@ -275,7 +273,7 @@ void TrayDetailsView::ButtonPressed(views::Button* sender,
   HandleButtonPressed(sender, event);
 }
 
-void TrayDetailsView::CreateTitleRow(int string_id) {
+void TrayDetailedView::CreateTitleRow(int string_id) {
   DCHECK(!tri_view_);
 
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
@@ -307,7 +305,7 @@ void TrayDetailsView::CreateTitleRow(int string_id) {
   Layout();
 }
 
-void TrayDetailsView::CreateScrollableList() {
+void TrayDetailedView::CreateScrollableList() {
   DCHECK(!scroller_);
   scroll_content_ = new ScrollContentsView();
   scroller_ = new views::ScrollView;
@@ -324,7 +322,7 @@ void TrayDetailsView::CreateScrollableList() {
   box_layout_->SetFlexForView(scroller_, 1);
 }
 
-HoverHighlightView* TrayDetailsView::AddScrollListItem(
+HoverHighlightView* TrayDetailedView::AddScrollListItem(
     const gfx::VectorIcon& icon,
     const base::string16& text) {
   HoverHighlightView* item = new HoverHighlightView(this);
@@ -336,7 +334,7 @@ HoverHighlightView* TrayDetailsView::AddScrollListItem(
   return item;
 }
 
-HoverHighlightView* TrayDetailsView::AddScrollListCheckableItem(
+HoverHighlightView* TrayDetailedView::AddScrollListCheckableItem(
     const gfx::VectorIcon& icon,
     const base::string16& text,
     bool checked) {
@@ -345,13 +343,13 @@ HoverHighlightView* TrayDetailsView::AddScrollListCheckableItem(
   return item;
 }
 
-HoverHighlightView* TrayDetailsView::AddScrollListCheckableItem(
+HoverHighlightView* TrayDetailedView::AddScrollListCheckableItem(
     const base::string16& text,
     bool checked) {
   return AddScrollListCheckableItem(gfx::kNoneIcon, text, checked);
 }
 
-void TrayDetailsView::SetupConnectedScrollListItem(HoverHighlightView* view) {
+void TrayDetailedView::SetupConnectedScrollListItem(HoverHighlightView* view) {
   DCHECK(view->is_populated());
 
   view->SetSubText(
@@ -361,15 +359,15 @@ void TrayDetailsView::SetupConnectedScrollListItem(HoverHighlightView* view) {
   style.SetupLabel(view->sub_text_label());
 }
 
-void TrayDetailsView::SetupConnectingScrollListItem(HoverHighlightView* view) {
+void TrayDetailedView::SetupConnectingScrollListItem(HoverHighlightView* view) {
   DCHECK(view->is_populated());
 
   view->SetSubText(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING));
 }
 
-TriView* TrayDetailsView::AddScrollListSubHeader(const gfx::VectorIcon& icon,
-                                                 int text_id) {
+TriView* TrayDetailedView::AddScrollListSubHeader(const gfx::VectorIcon& icon,
+                                                  int text_id) {
   TriView* header = TrayPopupUtils::CreateSubHeaderRowView(!icon.is_empty());
   TrayPopupUtils::ConfigureAsStickyHeader(header);
 
@@ -391,11 +389,11 @@ TriView* TrayDetailsView::AddScrollListSubHeader(const gfx::VectorIcon& icon,
   return header;
 }
 
-TriView* TrayDetailsView::AddScrollListSubHeader(int text_id) {
+TriView* TrayDetailedView::AddScrollListSubHeader(int text_id) {
   return AddScrollListSubHeader(gfx::kNoneIcon, text_id);
 }
 
-void TrayDetailsView::Reset() {
+void TrayDetailedView::Reset() {
   RemoveAllChildViews(true);
   scroller_ = nullptr;
   scroll_content_ = nullptr;
@@ -404,7 +402,7 @@ void TrayDetailsView::Reset() {
   tri_view_ = nullptr;
 }
 
-void TrayDetailsView::ShowProgress(double value, bool visible) {
+void TrayDetailedView::ShowProgress(double value, bool visible) {
   DCHECK(tri_view_);
   if (!progress_bar_) {
     progress_bar_ = new views::ProgressBar(kTitleRowProgressBarHeight);
@@ -417,7 +415,7 @@ void TrayDetailsView::ShowProgress(double value, bool visible) {
   child_at(kTitleRowSeparatorIndex)->SetVisible(!visible);
 }
 
-views::Button* TrayDetailsView::CreateSettingsButton(
+views::Button* TrayDetailedView::CreateSettingsButton(
     int setting_accessible_name_id) {
   SystemMenuButton* button = new SystemMenuButton(this, kSystemMenuSettingsIcon,
                                                   setting_accessible_name_id);
@@ -426,7 +424,7 @@ views::Button* TrayDetailsView::CreateSettingsButton(
   return button;
 }
 
-views::Button* TrayDetailsView::CreateHelpButton() {
+views::Button* TrayDetailedView::CreateHelpButton() {
   SystemMenuButton* button =
       new SystemMenuButton(this, kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
   // Help opens a web page, so treat it like Web UI settings.
@@ -435,29 +433,29 @@ views::Button* TrayDetailsView::CreateHelpButton() {
   return button;
 }
 
-void TrayDetailsView::HandleViewClicked(views::View* view) {
+void TrayDetailedView::HandleViewClicked(views::View* view) {
   NOTREACHED();
 }
 
-void TrayDetailsView::HandleButtonPressed(views::Button* sender,
-                                          const ui::Event& event) {
+void TrayDetailedView::HandleButtonPressed(views::Button* sender,
+                                           const ui::Event& event) {
   NOTREACHED();
 }
 
-void TrayDetailsView::CreateExtraTitleRowButtons() {}
+void TrayDetailedView::CreateExtraTitleRowButtons() {}
 
-void TrayDetailsView::TransitionToDefaultView() {
+void TrayDetailedView::TransitionToDefaultView() {
   if (back_button_ && back_button_->HasFocus())
     owner_->set_restore_focus(true);
 
   transition_delay_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTrayDetailedViewTransitionDelayMs),
-      this, &TrayDetailsView::DoTransitionToDefaultView);
+      this, &TrayDetailedView::DoTransitionToDefaultView);
 }
 
-void TrayDetailsView::DoTransitionToDefaultView() {
-  // Cache pointer to owner in this function scope. TrayDetailsView will be
+void TrayDetailedView::DoTransitionToDefaultView() {
+  // Cache pointer to owner in this function scope. TrayDetailedView will be
   // deleted after called ShowDefaultView.
   SystemTrayItem* owner = owner_;
   owner->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING,
@@ -465,19 +463,19 @@ void TrayDetailsView::DoTransitionToDefaultView() {
   owner->set_restore_focus(false);
 }
 
-views::Button* TrayDetailsView::CreateBackButton() {
+views::Button* TrayDetailedView::CreateBackButton() {
   SystemMenuButton* button = new SystemMenuButton(
       this, kSystemMenuArrowBackIcon, IDS_ASH_STATUS_TRAY_PREVIOUS_MENU);
   return button;
 }
 
-void TrayDetailsView::Layout() {
+void TrayDetailedView::Layout() {
   views::View::Layout();
   if (scroller_ && !scroller_->is_bounded())
     scroller_->ClipHeightTo(0, scroller_->height());
 }
 
-int TrayDetailsView::GetHeightForWidth(int width) const {
+int TrayDetailedView::GetHeightForWidth(int width) const {
   if (bounds().IsEmpty())
     return views::View::GetHeightForWidth(width);
 

ash/system/tray/tray_details_view.h → ash/system/tray/tray_detailed_view.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 ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
-#define ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
+#ifndef ASH_SYSTEM_TRAY_TRAY_DETAILED_VIEW_H_
+#define ASH_SYSTEM_TRAY_TRAY_DETAILED_VIEW_H_
 
 #include <memory>
 
@@ -33,12 +33,12 @@ class ScrollBorder;
 class SystemTrayItem;
 class TriView;
 
-class ASH_EXPORT TrayDetailsView : public views::View,
-                                   public ViewClickListener,
-                                   public views::ButtonListener {
+class ASH_EXPORT TrayDetailedView : public views::View,
+                                    public ViewClickListener,
+                                    public views::ButtonListener {
  public:
-  explicit TrayDetailsView(SystemTrayItem* owner);
-  ~TrayDetailsView() override;
+  explicit TrayDetailedView(SystemTrayItem* owner);
+  ~TrayDetailedView() override;
 
   // ViewClickListener:
   // Don't override this --- override HandleViewClicked.
@@ -115,7 +115,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
   views::View* scroll_content() const { return scroll_content_; }
 
  private:
-  friend class TrayDetailsViewTest;
+  friend class TrayDetailedViewTest;
 
   // Overridden to handle clicks on subclass-specific views.
   virtual void HandleViewClicked(views::View* view);
@@ -160,9 +160,9 @@ class ASH_EXPORT TrayDetailsView : public views::View,
   // Used to delay the transition to the default view.
   base::OneShotTimer transition_delay_timer_;
 
-  DISALLOW_COPY_AND_ASSIGN(TrayDetailsView);
+  DISALLOW_COPY_AND_ASSIGN(TrayDetailedView);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
+#endif  // ASH_SYSTEM_TRAY_TRAY_DETAILED_VIEW_H_

ash/system/tray/tray_details_view_unittest.cc → ash/system/tray/tray_detailed_view_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 "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -25,9 +25,9 @@ namespace ash {
 
 namespace {
 
-class TestDetailsView : public TrayDetailsView {
+class TestDetailsView : public TrayDetailedView {
  public:
-  explicit TestDetailsView(SystemTrayItem* owner) : TrayDetailsView(owner) {
+  explicit TestDetailsView(SystemTrayItem* owner) : TrayDetailedView(owner) {
     // Uses bluetooth label for testing purpose. It can be changed to any
     // string_id.
     CreateTitleRow(IDS_ASH_STATUS_TRAY_BLUETOOTH);
@@ -38,7 +38,7 @@ class TestDetailsView : public TrayDetailsView {
   void CreateScrollerViews() { CreateScrollableList(); }
 
   views::View* scroll_content() const {
-    return TrayDetailsView::scroll_content();
+    return TrayDetailedView::scroll_content();
   }
 
  private:
@@ -86,10 +86,10 @@ class TestItem : public SystemTrayItem {
 
 }  // namespace
 
-class TrayDetailsViewTest : public AshTestBase {
+class TrayDetailedViewTest : public AshTestBase {
  public:
-  TrayDetailsViewTest() = default;
-  ~TrayDetailsViewTest() override = default;
+  TrayDetailedViewTest() = default;
+  ~TrayDetailedViewTest() override = default;
 
   void TransitionFromDetailedToDefaultView(TestDetailsView* detailed) {
     detailed->TransitionToDefaultView();
@@ -118,10 +118,10 @@ class TrayDetailsViewTest : public AshTestBase {
   std::unique_ptr<base::ScopedMockTimeMessageLoopTaskRunner>
       scoped_task_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest);
+  DISALLOW_COPY_AND_ASSIGN(TrayDetailedViewTest);
 };
 
-TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
+TEST_F(TrayDetailedViewTest, TransitionToDefaultViewTest) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
@@ -171,7 +171,7 @@ TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
   EXPECT_FALSE(test_item_2->default_view()->HasFocus());
 }
 
-TEST_F(TrayDetailsViewTest, ScrollContentsTest) {
+TEST_F(TrayDetailedViewTest, ScrollContentsTest) {
   SystemTray* tray = GetPrimarySystemTray();
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(base::WrapUnique(test_item));

ash/system/tray/tray_popup_utils.h

@@ -63,8 +63,8 @@ class TrayPopupUtils {
   // can grow into the CENTER container if space is required and available. The
   // CENTER container has a flexible width.
   //
-  // TODO(mohsen): Merge this into TrayDetailsView::AddScrollListSubHeader()
-  // once network and VPN also use TrayDetailsView::AddScrollListSubHeader().
+  // TODO(mohsen): Merge this into TrayDetailedView::AddScrollListSubHeader()
+  // once network and VPN also use TrayDetailedView::AddScrollListSubHeader().
   static TriView* CreateSubHeaderRowView(bool start_visible);
 
   // Creates a container view to be used by system menu rows that want to embed

ash/system/tray_accessibility.cc

@@ -19,7 +19,7 @@
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
@@ -131,7 +131,7 @@ class DefaultAccessibilityView : public TrayItemMore {
 // ash::tray::AccessibilityDetailedView
 
 AccessibilityDetailedView::AccessibilityDetailedView(SystemTrayItem* owner)
-    : TrayDetailsView(owner) {
+    : TrayDetailedView(owner) {
   Reset();
   AppendAccessibilityList();
   CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);

ash/system/tray_accessibility.h

@@ -9,7 +9,7 @@
 
 #include "ash/accessibility/accessibility_delegate.h"
 #include "ash/accessibility/accessibility_observer.h"
-#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/tray/tray_image_item.h"
 #include "base/macros.h"
 #include "ui/gfx/font.h"
@@ -35,7 +35,7 @@ class TrayAccessibilityTest;
 namespace tray {
 
 // Create the detailed view of accessibility tray.
-class AccessibilityDetailedView : public TrayDetailsView {
+class AccessibilityDetailedView : public TrayDetailedView {
  public:
   explicit AccessibilityDetailedView(SystemTrayItem* owner);
   ~AccessibilityDetailedView() override {}
@@ -47,7 +47,7 @@ class AccessibilityDetailedView : public TrayDetailsView {
   friend class ::ash::TrayAccessibilityTest;
   friend class chromeos::TrayAccessibilityTest;
 
-  // TrayDetailsView:
+  // TrayDetailedView:
   void HandleViewClicked(views::View* view) override;
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override;