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

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

Issue 2369293002: Set status tray height to 37px on login screen (Closed)
Patch Set: Created 4 years, 2 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_BACKGROUND_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 25 matching lines...) Expand all
36 // auto-resizes the widget when necessary. 36 // auto-resizes the widget when necessary.
37 class TrayContainer : public views::View { 37 class TrayContainer : public views::View {
38 public: 38 public:
39 explicit TrayContainer(ShelfAlignment alignment); 39 explicit TrayContainer(ShelfAlignment alignment);
40 ~TrayContainer() override {} 40 ~TrayContainer() override {}
41 41
42 void SetAlignment(ShelfAlignment alignment); 42 void SetAlignment(ShelfAlignment alignment);
43 43
44 void set_size(const gfx::Size& size) { size_ = size; } 44 void set_size(const gfx::Size& size) { size_ = size; }
45 45
46 void SetMargin(const gfx::Insets& margin); 46 void SetMargin(int main_axis_margin, int cross_axis_margin);
47 47
48 // views::View: 48 // views::View:
49 gfx::Size GetPreferredSize() const override; 49 gfx::Size GetPreferredSize() const override;
50 50
51 protected: 51 protected:
52 // views::View: 52 // views::View:
53 void ChildPreferredSizeChanged(views::View* child) override; 53 void ChildPreferredSizeChanged(views::View* child) override;
54 void ChildVisibilityChanged(View* child) override; 54 void ChildVisibilityChanged(View* child) override;
55 void ViewHierarchyChanged( 55 void ViewHierarchyChanged(
56 const ViewHierarchyChangedDetails& details) override; 56 const ViewHierarchyChangedDetails& details) override;
57 57
58 private: 58 private:
59 void UpdateLayout(); 59 void UpdateLayout();
60 60
61 ShelfAlignment alignment_; 61 ShelfAlignment alignment_;
62 gfx::Size size_; 62 gfx::Size size_;
63 gfx::Insets margin_; 63 int main_axis_margin_ = 0;
64 int cross_axis_margin_ = 0;
64 65
65 DISALLOW_COPY_AND_ASSIGN(TrayContainer); 66 DISALLOW_COPY_AND_ASSIGN(TrayContainer);
66 }; 67 };
67 68
68 explicit TrayBackgroundView(WmShelf* wm_shelf); 69 explicit TrayBackgroundView(WmShelf* wm_shelf);
69 ~TrayBackgroundView() override; 70 ~TrayBackgroundView() override;
70 71
71 // Called after the tray has been added to the widget containing it. 72 // Called after the tray has been added to the widget containing it.
72 virtual void Initialize(); 73 virtual void Initialize();
73 74
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 177
177 std::unique_ptr<TrayWidgetObserver> widget_observer_; 178 std::unique_ptr<TrayWidgetObserver> widget_observer_;
178 std::unique_ptr<TrayEventFilter> tray_event_filter_; 179 std::unique_ptr<TrayEventFilter> tray_event_filter_;
179 180
180 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 181 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
181 }; 182 };
182 183
183 } // namespace ash 184 } // namespace ash
184 185
185 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 186 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/tray_background_view.cc » ('j') | ash/shelf/shelf_layout_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698