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

Unified Diff: athena/system/background_controller.cc

Issue 715053003: Introduce system_info as an independent container. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup includes Created 6 years, 1 month 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
« no previous file with comments | « athena/system/DEPS ('k') | athena/system/public/system_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/background_controller.cc
diff --git a/athena/system/background_controller.cc b/athena/system/background_controller.cc
index 67b0b7f017e245829fb3b7eafb535130288d72ee..cb90405120385ce3b6ad9271fd442f821b540ed7 100644
--- a/athena/system/background_controller.cc
+++ b/athena/system/background_controller.cc
@@ -17,11 +17,7 @@ namespace athena {
class BackgroundView : public views::View {
public:
- BackgroundView() : system_info_view_(nullptr) {
- system_info_view_ =
- SystemUI::Get()->CreateSystemInfoView(SystemUI::COLOR_SCHEME_LIGHT);
- AddChildView(system_info_view_);
- }
+ BackgroundView() {}
~BackgroundView() override {}
void SetImage(const gfx::ImageSkia& image) {
@@ -30,11 +26,6 @@ class BackgroundView : public views::View {
}
// views::View:
- virtual void Layout() override {
- system_info_view_->SetBounds(
- 0, 0, width(), system_info_view_->GetPreferredSize().height());
- }
-
virtual void OnPaint(gfx::Canvas* canvas) override {
canvas->DrawImageInt(image_,
0,
@@ -50,7 +41,6 @@ class BackgroundView : public views::View {
private:
gfx::ImageSkia image_;
- views::View* system_info_view_;
DISALLOW_COPY_AND_ASSIGN(BackgroundView);
};
« no previous file with comments | « athena/system/DEPS ('k') | athena/system/public/system_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698