Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/session/session_state_observer.h" | 9 #include "ash/common/session/session_state_observer.h" |
| 10 #include "ash/common/shell_observer.h" | 10 #include "ash/common/shell_observer.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 50 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 51 void SetShelfAlignment(ShelfAlignment alignment) override; | 51 void SetShelfAlignment(ShelfAlignment alignment) override; |
| 52 | 52 |
| 53 private: | 53 private: |
| 54 friend class OverviewButtonTrayTest; | 54 friend class OverviewButtonTrayTest; |
| 55 | 55 |
| 56 // Creates a new border for the icon. The padding is determined based on the | 56 // Creates a new border for the icon. The padding is determined based on the |
| 57 // alignment of the shelf. | 57 // alignment of the shelf. |
| 58 void SetIconBorderForShelfAlignment(); | 58 void SetIconBorderForShelfAlignment(); |
| 59 | 59 |
| 60 // Additional padding are used to adjust the user-visible size of overview | |
|
varkha
2016/07/14 21:34:47
nit: s/are/is
More importantly the comment should
yiyix
2016/07/26 20:27:31
Done.
| |
| 61 // button tray dark background in non-MD. | |
| 62 void AdjustOverviewBackground(); | |
|
varkha
2016/07/14 21:34:47
Maybe SetOverviewTrayBorder() ?
yiyix
2016/07/26 20:27:31
Sure, SetOverviewTrayBorder() is more about what t
| |
| 63 | |
| 60 // Sets the icon to visible if maximize mode is enabled and | 64 // Sets the icon to visible if maximize mode is enabled and |
| 61 // WindowSelectorController::CanSelect. | 65 // WindowSelectorController::CanSelect. |
| 62 void UpdateIconVisibility(); | 66 void UpdateIconVisibility(); |
| 63 | 67 |
| 64 // Weak pointer, will be parented by TrayContainer for its lifetime. | 68 // Weak pointer, will be parented by TrayContainer for its lifetime. |
| 65 views::ImageView* icon_; | 69 views::ImageView* icon_; |
| 66 | 70 |
| 67 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); | 71 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); |
| 68 }; | 72 }; |
| 69 | 73 |
| 70 } // namespace ash | 74 } // namespace ash |
| 71 | 75 |
| 72 #endif // ASH_COMMON_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ | 76 #endif // ASH_COMMON_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ |
| OLD | NEW |