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

Side by Side Diff: ash/common/system/tray/tray_item_more.h

Issue 2362443002: Removed font style application in TrayItemMore::ViewHierarchyChanged(). (Closed)
Patch Set: Removed style application from TrayItemMore::ViewHierarchyChanged(). Created 4 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
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_TRAY_TRAY_ITEM_MORE_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
7 7
8 #include "ash/common/system/tray/actionable_view.h" 8 #include "ash/common/system/tray/actionable_view.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
(...skipping 24 matching lines...) Expand all
35 // TODO(bruthig): Re-design to inform subclasses when the style changes while 35 // TODO(bruthig): Re-design to inform subclasses when the style changes while
36 // avoiding virtual function calls from the constructor. 36 // avoiding virtual function calls from the constructor.
37 void UpdateStyle(); 37 void UpdateStyle();
38 38
39 // Overridden from ActionableView. 39 // Overridden from ActionableView.
40 bool PerformAction(const ui::Event& event) override; 40 bool PerformAction(const ui::Event& event) override;
41 41
42 // Overridden from views::View. 42 // Overridden from views::View.
43 void Layout() override; 43 void Layout() override;
44 void GetAccessibleState(ui::AXViewState* state) override; 44 void GetAccessibleState(ui::AXViewState* state) override;
45 void ViewHierarchyChanged(
46 const ViewHierarchyChangedDetails& details) override;
47 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; 45 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
48 46
49 SystemTrayItem* owner_; 47 SystemTrayItem* owner_;
50 // True if |more_| should be shown. 48 // True if |more_| should be shown.
51 bool show_more_; 49 bool show_more_;
52 views::ImageView* icon_; 50 views::ImageView* icon_;
53 views::Label* label_; 51 views::Label* label_;
54 views::ImageView* more_; 52 views::ImageView* more_;
55 base::string16 accessible_name_; 53 base::string16 accessible_name_;
56 54
57 DISALLOW_COPY_AND_ASSIGN(TrayItemMore); 55 DISALLOW_COPY_AND_ASSIGN(TrayItemMore);
58 }; 56 };
59 57
60 } // namespace ash 58 } // namespace ash
61 59
62 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 60 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/tray_item_more.cc » ('j') | ash/common/system/tray/tray_item_more.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698