| Index: ash/system/tray_update.cc
|
| diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
|
| deleted file mode 100644
|
| index 1fe698b6252f49f6da34d5c49890ee8f67510fd2..0000000000000000000000000000000000000000
|
| --- a/ash/system/tray_update.cc
|
| +++ /dev/null
|
| @@ -1,115 +0,0 @@
|
| -// 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_update.h"
|
| -
|
| -#include "ash/common/system/tray/fixed_sized_image_view.h"
|
| -#include "ash/common/system/tray/system_tray_delegate.h"
|
| -#include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/common/system/tray/wm_system_tray_notifier.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/system/tray/system_tray.h"
|
| -#include "grit/ash_resources.h"
|
| -#include "grit/ash_strings.h"
|
| -#include "ui/aura/window.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/gfx/image/image.h"
|
| -#include "ui/views/controls/image_view.h"
|
| -#include "ui/views/controls/label.h"
|
| -#include "ui/views/layout/box_layout.h"
|
| -#include "ui/views/widget/widget.h"
|
| -
|
| -namespace {
|
| -
|
| -int DecideResource(ash::UpdateInfo::UpdateSeverity severity, bool dark) {
|
| - switch (severity) {
|
| - case ash::UpdateInfo::UPDATE_NORMAL:
|
| - return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK:
|
| - IDR_AURA_UBER_TRAY_UPDATE;
|
| -
|
| - case ash::UpdateInfo::UPDATE_LOW_GREEN:
|
| - return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_GREEN :
|
| - IDR_AURA_UBER_TRAY_UPDATE_GREEN;
|
| -
|
| - case ash::UpdateInfo::UPDATE_HIGH_ORANGE:
|
| - return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_ORANGE :
|
| - IDR_AURA_UBER_TRAY_UPDATE_ORANGE;
|
| -
|
| - case ash::UpdateInfo::UPDATE_SEVERE_RED:
|
| - return dark ? IDR_AURA_UBER_TRAY_UPDATE_DARK_RED :
|
| - IDR_AURA_UBER_TRAY_UPDATE_RED;
|
| - }
|
| -
|
| - NOTREACHED() << "Unknown update severity level.";
|
| - return 0;
|
| -}
|
| -
|
| -class UpdateView : public ash::ActionableView {
|
| - public:
|
| - explicit UpdateView(const ash::UpdateInfo& info) {
|
| - SetLayoutManager(new
|
| - views::BoxLayout(views::BoxLayout::kHorizontal,
|
| - ash::kTrayPopupPaddingHorizontal, 0,
|
| - ash::kTrayPopupPaddingBetweenItems));
|
| -
|
| - ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
|
| - views::ImageView* image =
|
| - new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
|
| - image->SetImage(bundle.GetImageNamed(DecideResource(info.severity, true))
|
| - .ToImageSkia());
|
| -
|
| - AddChildView(image);
|
| -
|
| - base::string16 label =
|
| - info.factory_reset_required
|
| - ? bundle.GetLocalizedString(
|
| - IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE)
|
| - : bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
|
| - AddChildView(new views::Label(label));
|
| - SetAccessibleName(label);
|
| - }
|
| -
|
| - ~UpdateView() override {}
|
| -
|
| - private:
|
| - // Overridden from ActionableView.
|
| - bool PerformAction(const ui::Event& event) override {
|
| - ash::WmShell::Get()->system_tray_delegate()->RequestRestartForUpdate();
|
| - return true;
|
| - }
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(UpdateView);
|
| -};
|
| -
|
| -}
|
| -
|
| -namespace ash {
|
| -
|
| -TrayUpdate::TrayUpdate(SystemTray* system_tray)
|
| - : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_UPDATE) {
|
| - WmShell::Get()->system_tray_notifier()->AddUpdateObserver(this);
|
| -}
|
| -
|
| -TrayUpdate::~TrayUpdate() {
|
| - WmShell::Get()->system_tray_notifier()->RemoveUpdateObserver(this);
|
| -}
|
| -
|
| -bool TrayUpdate::GetInitialVisibility() {
|
| - UpdateInfo info;
|
| - WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&info);
|
| - return info.update_required;
|
| -}
|
| -
|
| -views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
|
| - UpdateInfo info;
|
| - WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&info);
|
| - return info.update_required ? new UpdateView(info) : nullptr;
|
| -}
|
| -
|
| -void TrayUpdate::OnUpdateRecommended(const UpdateInfo& info) {
|
| - SetImageFromResourceId(DecideResource(info.severity, false));
|
| - tray_view()->SetVisible(true);
|
| -}
|
| -
|
| -} // namespace ash
|
|
|