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

Side by Side Diff: athena/system/system_ui_impl.cc

Issue 483033003: [Athena] Add status icons and system time to the centered home card (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/system/public/system_ui.h" 5 #include "athena/system/public/system_ui.h"
6 6
7 #include "athena/common/container_priorities.h" 7 #include "athena/common/container_priorities.h"
8 #include "athena/common/fill_layout_manager.h" 8 #include "athena/common/fill_layout_manager.h"
9 #include "athena/screen/public/screen_manager.h" 9 #include "athena/screen/public/screen_manager.h"
10 #include "athena/system/background_controller.h" 10 #include "athena/system/background_controller.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ScreenManager::Get()->CreateContainer(system_modal_params); 51 ScreenManager::Get()->CreateContainer(system_modal_params);
52 52
53 background_controller_.reset( 53 background_controller_.reset(
54 new BackgroundController(background_container_)); 54 new BackgroundController(background_container_));
55 } 55 }
56 56
57 virtual void SetBackgroundImage(const gfx::ImageSkia& image) OVERRIDE { 57 virtual void SetBackgroundImage(const gfx::ImageSkia& image) OVERRIDE {
58 background_controller_->SetImage(image); 58 background_controller_->SetImage(image);
59 } 59 }
60 60
61 virtual views::View* CreateTimeView() OVERRIDE { 61 virtual views::View* CreateTimeView(ColorScheme color_scheme) OVERRIDE {
62 return new TimeView; 62 return new TimeView(color_scheme);
63 } 63 }
64 64
65 virtual views::View* CreateStatusIconView() OVERRIDE { 65 virtual views::View* CreateStatusIconView(ColorScheme color_scheme) OVERRIDE {
66 return new StatusIconContainerView(system_modal_container_); 66 return new StatusIconContainerView(color_scheme, system_modal_container_);
67 } 67 }
68 68
69 private: 69 private:
70 scoped_refptr<OrientationController> orientation_controller_; 70 scoped_refptr<OrientationController> orientation_controller_;
71 scoped_ptr<PowerButtonController> power_button_controller_; 71 scoped_ptr<PowerButtonController> power_button_controller_;
72 scoped_ptr<BackgroundController> background_controller_; 72 scoped_ptr<BackgroundController> background_controller_;
73 73
74 // The parent container for the background. 74 // The parent container for the background.
75 aura::Window* background_container_; 75 aura::Window* background_container_;
76 76
(...skipping 22 matching lines...) Expand all
99 99
100 // static 100 // static
101 void SystemUI::Shutdown() { 101 void SystemUI::Shutdown() {
102 CHECK(instance); 102 CHECK(instance);
103 delete instance; 103 delete instance;
104 instance = NULL; 104 instance = NULL;
105 DeviceSocketListener::ShutdownSocketManager(); 105 DeviceSocketListener::ShutdownSocketManager();
106 } 106 }
107 107
108 } // namespace athena 108 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698