Materialized the font/icon color for some default rows in the system menu.

ash/system/chromeos/rotation/tray_rotation_lock.cc

 // Copyright 2014 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/system/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
@@ skipping 12 matching lines @@
   explicit RotationLockDefaultView(SystemTrayItem* owner);
   ~RotationLockDefaultView() override;
 
   // ActionableView:
   bool PerformAction(const ui::Event& event) override;
 
   // ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
+ protected:
+  // TrayItemMore:
+  void UpdateStyle() override;
+
  private:
   void UpdateImage();
 
   DISALLOW_COPY_AND_ASSIGN(RotationLockDefaultView);
 };
 
 RotationLockDefaultView::RotationLockDefaultView(SystemTrayItem* owner)
     : TrayItemMore(owner, false) {
-  UpdateImage();
   SetVisible(WmShell::Get()
                  ->maximize_mode_controller()
                  ->IsMaximizeModeWindowManagerEnabled());
   WmShell::Get()->AddShellObserver(this);
 }
 
 RotationLockDefaultView::~RotationLockDefaultView() {
   WmShell::Get()->RemoveShellObserver(this);
 }
 
 bool RotationLockDefaultView::PerformAction(const ui::Event& event) {
   ScreenOrientationController* screen_orientation_controller =
       Shell::GetInstance()->screen_orientation_controller();
   screen_orientation_controller->SetRotationLocked(
       !screen_orientation_controller->rotation_locked());
   UpdateImage();
   return true;
 }
 
 void RotationLockDefaultView::OnMaximizeModeStarted() {
   UpdateImage();
   SetVisible(true);
 }
 
 void RotationLockDefaultView::OnMaximizeModeEnded() {
   SetVisible(false);
 }
 
+void RotationLockDefaultView::UpdateStyle() {
+  TrayItemMore::UpdateStyle();
+  UpdateImage();
+}
+
 void RotationLockDefaultView::UpdateImage() {
   const bool rotation_locked =
       Shell::GetInstance()->screen_orientation_controller()->rotation_locked();
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
+    std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
     SetImage(gfx::CreateVectorIcon(rotation_locked
                                        ? kSystemMenuRotationLockLockedIcon
                                        : kSystemMenuRotationLockAutoIcon,
-                                   kMenuIconSize, kMenuIconColor));
+                                   kMenuIconSize, style->GetForegroundColor()));
   } else {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     const int resource_id = rotation_locked
                                 ? IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED_DARK
                                 : IDR_AURA_UBER_TRAY_AUTO_ROTATION_DARK;
     SetImage(*bundle.GetImageNamed(resource_id).ToImageSkia());
   }
 
   base::string16 label = l10n_util::GetStringUTF16(
       rotation_locked ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED
@@ skipping 77 matching lines @@
 }
 
 void TrayRotationLock::StopObservingShell() {
   if (!observing_shell_)
     return;
   WmShell::Get()->RemoveShellObserver(this);
   observing_shell_ = false;
 }
 
 }  // namespace ash