[merge to M59] cros: Update rotation lock UI

ash/system/tray/tray_image_item.cc

 // Copyright (c) 2012 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/tray/tray_image_item.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shelf/wm_shelf_util.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 17 matching lines @@
 TrayImageItem::~TrayImageItem() {}
 
 views::View* TrayImageItem::tray_view() {
   return tray_view_;
 }
 
 views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
   CHECK(!tray_view_);
   tray_view_ = new TrayItemView(this);
   tray_view_->CreateImageView();
-  UpdateImageOnImageView();
+  SetImageIcon(icon_);
   tray_view_->SetVisible(GetInitialVisibility());
   return tray_view_;
 }
 
 void TrayImageItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
 void TrayImageItem::SetIconColor(SkColor color) {
   icon_color_ = color;
-  UpdateImageOnImageView();
+  SetImageIcon(icon_);
 }
 
-void TrayImageItem::UpdateImageOnImageView() {
+void TrayImageItem::SetImageIcon(const gfx::VectorIcon& icon) {
   if (!tray_view_)
     return;
 
   tray_view_->image_view()->SetImage(
-      gfx::CreateVectorIcon(icon_, kTrayIconSize, icon_color_));
+      gfx::CreateVectorIcon(icon, kTrayIconSize, icon_color_));
 }
 
 }  // namespace ash