Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: ash/system/chromeos/power/power_status_view.h

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/power/power_status_view.h
diff --git a/ash/system/chromeos/power/power_status_view.h b/ash/system/chromeos/power/power_status_view.h
deleted file mode 100644
index c050d4d3a53fd9e17f7adb058fca420814eac2ad..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/power/power_status_view.h
+++ /dev/null
@@ -1,63 +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.
-
-#ifndef ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_
-
-#include "ash/ash_export.h"
-#include "ash/system/chromeos/power/power_status.h"
-#include "base/macros.h"
-#include "ui/views/view.h"
-
-namespace views {
-class ImageView;
-class Label;
-}
-
-namespace ash {
-
-class ASH_EXPORT PowerStatusView : public views::View,
- public PowerStatus::Observer {
- public:
- PowerStatusView(bool default_view_right_align);
- ~PowerStatusView() override;
-
- // Overridden from views::View.
- gfx::Size GetPreferredSize() const override;
- int GetHeightForWidth(int width) const override;
- void Layout() override;
-
- // Overridden from PowerStatus::Observer.
- void OnPowerStatusChanged() override;
-
- private:
- friend class PowerStatusViewTest;
-
- void LayoutView();
- void UpdateText();
-
- // Overridden from views::View.
- void ChildPreferredSizeChanged(views::View* child) override;
-
- // Layout default view UI items on the right side of system tray pop up item
- // if true; otherwise, layout the UI items on the left side.
- bool default_view_right_align_;
-
- views::Label* percentage_label_;
- views::Label* separator_label_;
- views::Label* time_status_label_;
-
- // Battery status indicator icon.
- views::ImageView* icon_;
-
- // Information about the image last used to update |icon_|. Cached to avoid
- // unnecessary updates (http://crbug.com/589348).
- PowerStatus::BatteryImageInfo previous_battery_image_info_;
-
- DISALLOW_COPY_AND_ASSIGN(PowerStatusView);
-};
-
-} // namespace ash
-
-#endif // ASH_SYSTEM_CHROMEOS_POWER_POWER_STATUS_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698