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

Side by Side Diff: ash/common/system/chromeos/screen_security/screen_tray_item.h

Issue 2661023006: Remove unused references to NativeTheme in TrayPopupItemStyle. (Closed)
Patch Set: slight improvement 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/common/system/tray/system_tray.h" 10 #include "ash/common/system/tray/system_tray.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 50 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
51 51
52 void CreateItems(); 52 void CreateItems();
53 void UpdateFromScreenTrayItem(); 53 void UpdateFromScreenTrayItem();
54 54
55 protected: 55 protected:
56 views::ImageView* icon() { return icon_; } 56 views::ImageView* icon() { return icon_; }
57 views::Label* label() { return label_; } 57 views::Label* label() { return label_; }
58 views::Button* stop_button() { return stop_button_; } 58 views::Button* stop_button() { return stop_button_; }
59 59
60 // Overridden from views::View:
61 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
62
63 private: 60 private:
64 // The controller for this view. May be null. 61 // The controller for this view. May be null.
65 ScreenTrayItem* screen_tray_item_; 62 ScreenTrayItem* screen_tray_item_;
66 views::ImageView* icon_; 63 views::ImageView* icon_;
67 views::Label* label_; 64 views::Label* label_;
68 views::Button* stop_button_; 65 views::Button* stop_button_;
69 base::string16 label_text_; 66 base::string16 label_text_;
70 base::string16 stop_button_text_; 67 base::string16 stop_button_text_;
71 68
72 DISALLOW_COPY_AND_ASSIGN(ScreenStatusView); 69 DISALLOW_COPY_AND_ASSIGN(ScreenStatusView);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 tray::ScreenStatusView* default_view_; 132 tray::ScreenStatusView* default_view_;
136 bool is_started_; 133 bool is_started_;
137 base::Closure stop_callback_; 134 base::Closure stop_callback_;
138 135
139 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem); 136 DISALLOW_COPY_AND_ASSIGN(ScreenTrayItem);
140 }; 137 };
141 138
142 } // namespace ash 139 } // namespace ash
143 140
144 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_ 141 #endif // ASH_COMMON_SYSTEM_CHROMEOS_SCREEN_SECURITY_SCREEN_TRAY_ITEM_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/power/power_status_view.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698