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

Side by Side Diff: ash/common/system/status_area_widget.h

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 10 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
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 5 #ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/common/shelf/shelf_background_animator_observer.h" 10 #include "ash/common/shelf/shelf_background_animator_observer.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a 73 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a
74 // paint. 74 // paint.
75 void SchedulePaint(); 75 void SchedulePaint();
76 76
77 // Overridden from views::Widget: 77 // Overridden from views::Widget:
78 const ui::NativeTheme* GetNativeTheme() const override; 78 const ui::NativeTheme* GetNativeTheme() const override;
79 void OnNativeWidgetActivationChanged(bool active) override; 79 void OnNativeWidgetActivationChanged(bool active) override;
80 80
81 // ShelfBackgroundAnimatorObserver: 81 // ShelfBackgroundAnimatorObserver:
82 void UpdateShelfItemBackground(int alpha) override; 82 void UpdateShelfItemBackground(SkColor color) override;
83 83
84 private: 84 private:
85 void AddSystemTray(); 85 void AddSystemTray();
86 void AddWebNotificationTray(); 86 void AddWebNotificationTray();
87 void AddLogoutButtonTray(); 87 void AddLogoutButtonTray();
88 void AddPaletteTray(); 88 void AddPaletteTray();
89 void AddVirtualKeyboardTray(); 89 void AddVirtualKeyboardTray();
90 void AddImeMenuTray(); 90 void AddImeMenuTray();
91 void AddOverviewButtonTray(); 91 void AddOverviewButtonTray();
92 92
93 // Weak pointers to View classes that are parented to StatusAreaWidget: 93 // Weak pointers to View classes that are parented to StatusAreaWidget:
94 StatusAreaWidgetDelegate* status_area_widget_delegate_; 94 StatusAreaWidgetDelegate* status_area_widget_delegate_;
95 OverviewButtonTray* overview_button_tray_; 95 OverviewButtonTray* overview_button_tray_;
96 SystemTray* system_tray_; 96 SystemTray* system_tray_;
97 WebNotificationTray* web_notification_tray_; 97 WebNotificationTray* web_notification_tray_;
98 LogoutButtonTray* logout_button_tray_; 98 LogoutButtonTray* logout_button_tray_;
99 PaletteTray* palette_tray_; 99 PaletteTray* palette_tray_;
100 VirtualKeyboardTray* virtual_keyboard_tray_; 100 VirtualKeyboardTray* virtual_keyboard_tray_;
101 ImeMenuTray* ime_menu_tray_; 101 ImeMenuTray* ime_menu_tray_;
102 LoginStatus login_status_; 102 LoginStatus login_status_;
103 103
104 WmShelf* wm_shelf_; 104 WmShelf* wm_shelf_;
105 105
106 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 106 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
107 }; 107 };
108 108
109 } // namespace ash 109 } // namespace ash
110 110
111 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 111 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698