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

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

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 4 years, 6 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 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/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"
11 #include "ash/system/tray/tray_background_view.h" 11 #include "ash/common/system/tray/tray_background_view.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace views { 14 namespace views {
15 class ImageView; 15 class ImageView;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class StatusAreaWidget;
21
20 // Status area tray for showing a toggle for Overview Mode. Overview Mode 22 // Status area tray for showing a toggle for Overview Mode. Overview Mode
21 // is equivalent to WindowSelectorController being in selection mode. 23 // is equivalent to WindowSelectorController being in selection mode.
22 // This hosts a ShellObserver that listens for the activation of Maximize Mode 24 // This hosts a ShellObserver that listens for the activation of Maximize Mode
23 // This tray will only be visible while in this state. This tray does not 25 // This tray will only be visible while in this state. This tray does not
24 // provide any bubble view windows. 26 // provide any bubble view windows.
25 class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView, 27 class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
26 public SessionStateObserver, 28 public SessionStateObserver,
27 public ShellObserver { 29 public ShellObserver {
28 public: 30 public:
29 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget); 31 explicit OverviewButtonTray(StatusAreaWidget* status_area_widget);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 65
64 // Weak pointer, will be parented by TrayContainer for its lifetime. 66 // Weak pointer, will be parented by TrayContainer for its lifetime.
65 views::ImageView* icon_; 67 views::ImageView* icon_;
66 68
67 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray); 69 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTray);
68 }; 70 };
69 71
70 } // namespace ash 72 } // namespace ash
71 73
72 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_ 74 #endif // ASH_SYSTEM_OVERVIEW_OVERVIEW_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc ('k') | ash/system/overview/overview_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698