Remove unused references to NativeTheme in TrayPopupItemStyle.

ash/common/system/chromeos/ime_menu/ime_list_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 102 matching lines @@
     // or "...". So we shrink the font size until it fits within the bounds.
     int size_delta = -1;
     while (id_label->GetPreferredSize().width() > kMenuIconSize &&
            size_delta >= kMinFontSizeDelta) {
       id_label->SetFontList(base_font_list.DeriveWithSizeDelta(size_delta));
       --size_delta;
     }
     tri_view->AddView(TriView::Container::START, id_label);
 
     // The label shows the IME name.
-    label_ = TrayPopupUtils::CreateDefaultLabel();
-    label_->SetText(label);
-    UpdateStyle();
-    label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    tri_view->AddView(TriView::Container::CENTER, label_);
+    auto label_view = TrayPopupUtils::CreateDefaultLabel();
+    label_view->SetText(label);
+    TrayPopupItemStyle style(
+        TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
+    style.SetupLabel(label_view);
+
+    label_view->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    tri_view->AddView(TriView::Container::CENTER, label_view);
 
     if (selected) {
       // The checked button indicates the IME is selected.
       views::ImageView* checked_image = TrayPopupUtils::CreateMainImageView();
       checked_image->SetImage(gfx::CreateVectorIcon(
           gfx::VectorIconId::CHECK_CIRCLE, kMenuIconSize, button_color));
       tri_view->AddView(TriView::Container::END, checked_image);
     }
-    SetAccessibleName(label_->text());
+    SetAccessibleName(label_view->text());
   }
 
   ~ImeListItemView() override {}
 
   // ActionableView:
   bool PerformAction(const ui::Event& event) override {
     if (ime_list_view_->should_focus_ime_after_selection_with_keyboard() &&
         event.type() == ui::EventType::ET_KEY_PRESSED) {
       ime_list_view_->set_last_item_selected_with_keyboard(true);
     } else {
       ime_list_view_->set_last_item_selected_with_keyboard(false);
     }
 
     ime_list_view_->HandleViewClicked(this);
     return true;
   }
 
   void OnFocus() override {
     ActionableView::OnFocus();
     if (ime_list_view_ && ime_list_view_->scroll_content())
       ime_list_view_->scroll_content()->ScrollRectToVisible(bounds());
   }
 
-  // views::View:
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    UpdateStyle();
-  }
-
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
     ActionableView::GetAccessibleNodeData(node_data);
     node_data->role = ui::AX_ROLE_CHECK_BOX;
     node_data->AddStateFlag(selected_ ? ui::AX_STATE_CHECKED
                                       : ui::AX_STATE_NONE);
   }
 
  private:
-  // Updates the style of |label_| based on the current native theme.
-  void UpdateStyle() {
-    TrayPopupItemStyle style(
-        GetNativeTheme(), TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
-    style.SetupLabel(label_);
-  }
-
-  // The label shows the IME name.
-  views::Label* label_;
   ImeListView* ime_list_view_;
   bool selected_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeListItemView);
 };
 
 }  // namespace
 
 // The view that contains a |KeyboardButtonView| and a toggle button.
 class MaterialKeyboardStatusRowView : public views::View {
  public:
   MaterialKeyboardStatusRowView(views::ButtonListener* listener, bool enabled)
-      : listener_(listener), label_(nullptr), toggle_(nullptr) {
+      : listener_(listener), toggle_(nullptr) {
     Init();
     toggle_->SetIsOn(enabled, false);
   }
 
   ~MaterialKeyboardStatusRowView() override {}
 
   const views::Button* toggle() const { return toggle_; }
   bool is_toggled() const { return toggle_->is_on(); }
 
  protected:
   // views::View:
   int GetHeightForWidth(int w) const override {
     return GetPreferredSize().height();
   }
 
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    UpdateStyle();
-  }
-
  private:
   void Init() {
     TrayPopupUtils::ConfigureAsStickyHeader(this);
     SetLayoutManager(new views::FillLayout);
 
     TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
     AddChildView(tri_view);
 
     // The on-screen keyboard image button.
     views::ImageView* keyboard_image = TrayPopupUtils::CreateMainImageView();
     keyboard_image->SetImage(gfx::CreateVectorIcon(
         kImeMenuOnScreenKeyboardIcon, kMenuIconSize, kMenuIconColor));
     tri_view->AddView(TriView::Container::START, keyboard_image);
 
-    // The on-screen keyboard label.
-    label_ = TrayPopupUtils::CreateDefaultLabel();
-    label_->SetText(ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+    // The on-screen keyboard label ('On-screen keyboard').
+    auto label = TrayPopupUtils::CreateDefaultLabel();
+    label->SetText(ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
         IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD));
-    UpdateStyle();
-    tri_view->AddView(TriView::Container::CENTER, label_);
+    TrayPopupItemStyle style(
+        TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
+    style.SetupLabel(label);
+    tri_view->AddView(TriView::Container::CENTER, label);
 
     // The on-screen keyboard toggle button.
     toggle_ = TrayPopupUtils::CreateToggleButton(
         listener_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD);
     tri_view->AddView(TriView::Container::END, toggle_);
   }
 
-  // Updates the style of |label_| based on the current native theme.
-  void UpdateStyle() {
-    TrayPopupItemStyle style(
-        GetNativeTheme(), TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
-    style.SetupLabel(label_);
-  }
-
   // ButtonListener to notify when |toggle_| is clicked.
   views::ButtonListener* listener_;
 
-  // Label to with text 'On-screen keyboard'.
-  views::Label* label_;
-
   // ToggleButton to toggle keyboard on or off.
   views::ToggleButton* toggle_;
 
   DISALLOW_COPY_AND_ASSIGN(MaterialKeyboardStatusRowView);
 };
 
 ImeListView::ImeListView(SystemTrayItem* owner,
                          bool show_keyboard_toggle,
                          SingleImeBehavior single_ime_behavior)
     : TrayDetailsView(owner),
@@ skipping 215 matching lines @@
 
   for (auto property_map : property_map_) {
     if (property_map.second == last_selected_item_id_) {
       (property_map.first)->RequestFocus();
       return;
     }
   }
 }
 
 }  // namespace ash