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

Side by Side Diff: ash/system/overview/overview_button_tray.h

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 years, 8 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
« no previous file with comments | « ash/system/network/tray_vpn.cc ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 5 #ifndef ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 6 #define ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/session/session_observer.h" 9 #include "ash/session/session_observer.h"
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // ShellObserver: 42 // ShellObserver:
43 void OnMaximizeModeStarted() override; 43 void OnMaximizeModeStarted() override;
44 void OnMaximizeModeEnded() override; 44 void OnMaximizeModeEnded() override;
45 void OnOverviewModeStarting() override; 45 void OnOverviewModeStarting() override;
46 void OnOverviewModeEnded() override; 46 void OnOverviewModeEnded() override;
47 47
48 // TrayBackgroundView: 48 // TrayBackgroundView:
49 void ClickedOutsideBubble() override; 49 void ClickedOutsideBubble() override;
50 base::string16 GetAccessibleNameForTray() override; 50 base::string16 GetAccessibleNameForTray() override;
51 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 51 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
52 void SetShelfAlignment(ShelfAlignment alignment) override;
53 52
54 private: 53 private:
55 friend class OverviewButtonTrayTest; 54 friend class OverviewButtonTrayTest;
56 55
57 // Creates a new border for the icon. The padding is determined based on the
58 // alignment of the shelf.
59 void SetIconBorderForShelfAlignment();
60
61 // Sets the icon to visible if maximize mode is enabled and 56 // Sets the icon to visible if maximize mode is enabled and
62 // WindowSelectorController::CanSelect. 57 // WindowSelectorController::CanSelect.
63 void UpdateIconVisibility(); 58 void UpdateIconVisibility();
64 59
65 // Weak pointer, will be parented by TrayContainer for its lifetime. 60 // Weak pointer, will be parented by TrayContainer for its lifetime.
66 views::ImageView* icon_; 61 views::ImageView* icon_;
67 62
68 ScopedSessionObserver scoped_session_observer_; 63 ScopedSessionObserver scoped_session_observer_;
69 64
70 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); 65 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray);
71 }; 66 };
72 67
73 } // namespace ash 68 } // namespace ash
74 69
75 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 70 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/network/tray_vpn.cc ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698