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

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

Issue 844763006: Change overview mode to so that docked panel windows are not grouped together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed stale pointer in ScopedTransformOverviewWindow. Created 5 years, 11 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/shell_observer.h ('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/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 19 matching lines...) Expand all
30 // Updates the tray's visibility based on the LoginStatus and the current 30 // Updates the tray's visibility based on the LoginStatus and the current
31 // state of MaximizeMode 31 // state of MaximizeMode
32 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status); 32 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
33 33
34 // ActionableView: 34 // ActionableView:
35 bool PerformAction(const ui::Event& event) override; 35 bool PerformAction(const ui::Event& event) override;
36 36
37 // ShellObserver: 37 // ShellObserver:
38 void OnMaximizeModeStarted() override; 38 void OnMaximizeModeStarted() override;
39 void OnMaximizeModeEnded() override; 39 void OnMaximizeModeEnded() override;
40 void OnOverviewModeEnding() override; 40 void OnOverviewModeEnded() override;
41 41
42 // TrayBackgroundView: 42 // TrayBackgroundView:
43 bool ClickedOutsideBubble() override; 43 bool ClickedOutsideBubble() override;
44 base::string16 GetAccessibleNameForTray() override; 44 base::string16 GetAccessibleNameForTray() override;
45 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 45 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
46 void SetShelfAlignment(ShelfAlignment alignment) override; 46 void SetShelfAlignment(ShelfAlignment alignment) override;
47 47
48 private: 48 private:
49 friend class OverviewButtonTrayTest; 49 friend class OverviewButtonTrayTest;
50 50
51 // Creates a new border for the icon. The padding is determined based on the 51 // Creates a new border for the icon. The padding is determined based on the
52 // alignment of the shelf. 52 // alignment of the shelf.
53 void SetIconBorderForShelfAlignment(); 53 void SetIconBorderForShelfAlignment();
54 54
55 // Sets the icon to visible if maximize mode is enabled and 55 // Sets the icon to visible if maximize mode is enabled and
56 // WindowSelectorController::CanSelect. 56 // WindowSelectorController::CanSelect.
57 void UpdateIconVisibility(); 57 void UpdateIconVisibility();
58 58
59 // Weak pointer, will be parented by TrayContainer for its lifetime. 59 // Weak pointer, will be parented by TrayContainer for its lifetime.
60 views::ImageView* icon_; 60 views::ImageView* icon_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); 62 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray);
63 }; 63 };
64 64
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 67 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/shell_observer.h ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698