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

Side by Side Diff: ash/system/status_area_widget_delegate.h

Issue 2103113003: Fix shelf layout when switching from left-aligned shelf to right-aligned shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 5 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_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shelf/shelf_types.h" 9 #include "ash/common/shelf/shelf_types.h"
10 #include "ash/wm/gestures/shelf_gesture_handler.h" 10 #include "ash/wm/gestures/shelf_gesture_handler.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void DeleteDelegate() override; 48 void DeleteDelegate() override;
49 49
50 protected: 50 protected:
51 // Overridden from views::View: 51 // Overridden from views::View:
52 void ChildPreferredSizeChanged(views::View* child) override; 52 void ChildPreferredSizeChanged(views::View* child) override;
53 void ChildVisibilityChanged(views::View* child) override; 53 void ChildVisibilityChanged(views::View* child) override;
54 54
55 private: 55 private:
56 void UpdateWidgetSize(); 56 void UpdateWidgetSize();
57 57
58 // Sets a border on |child|. If |extend_border_to_edge| is true, then an extra
59 // wide border is added to extend the view's hit region to the edge of the
60 // screen.
61 void SetBorderOnChild(views::View* child, bool extend_border_to_edge);
62
63 const FocusCycler* focus_cycler_for_testing_; 58 const FocusCycler* focus_cycler_for_testing_;
64 ShelfAlignment alignment_; 59 ShelfAlignment alignment_;
65 60
66 ShelfGestureHandler gesture_handler_; 61 ShelfGestureHandler gesture_handler_;
67 62
68 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); 63 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
69 }; 64 };
70 65
71 } // namespace ash 66 } // namespace ash
72 67
73 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 68 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698