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

Side by Side Diff: ash/common/system/chromeos/palette/palette_tray.h

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "ash/common/session/session_state_observer.h" 12 #include "ash/common/session/session_state_observer.h"
13 #include "ash/common/shell_observer.h" 13 #include "ash/common/shell_observer.h"
14 #include "ash/common/system/chromeos/palette/palette_tool_manager.h" 14 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
15 #include "ash/common/system/tray/tray_background_view.h" 15 #include "ash/common/system/tray/tray_background_view.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 17
18 namespace views { 18 namespace views {
19 class ImageView; 19 class ImageView;
20 class Widget; 20 class Widget;
21 } 21 }
22 22
23 namespace ash { 23 namespace ash {
24 24
25 class TrayBubbleWrapper; 25 class TrayBubbleWrapper;
26 class PaletteToolManager; 26 class PaletteToolManager;
27 class WmShelfObserver;
27 28
28 // The PaletteTray shows the palette in the bottom area of the screen. This 29 // The PaletteTray shows the palette in the bottom area of the screen. This
29 // class also controls the lifetime for all of the tools available in the 30 // class also controls the lifetime for all of the tools available in the
30 // palette. 31 // palette.
31 class ASH_EXPORT PaletteTray : public TrayBackgroundView, 32 class ASH_EXPORT PaletteTray : public TrayBackgroundView,
32 public SessionStateObserver, 33 public SessionStateObserver,
33 public ShellObserver, 34 public ShellObserver,
34 public PaletteToolManager::Delegate, 35 public PaletteToolManager::Delegate,
35 public views::TrayBubbleView::Delegate { 36 public views::TrayBubbleView::Delegate {
36 public: 37 public:
37 explicit PaletteTray(WmShelf* wm_shelf); 38 explicit PaletteTray(WmShelf* wm_shelf, WmShelfObserver* wm_shelf_observer);
James Cook 2016/08/09 00:25:17 ditto
yiyix 2016/08/11 01:23:18 Done.
38 ~PaletteTray() override; 39 ~PaletteTray() override;
39 40
40 // ActionableView: 41 // ActionableView:
41 bool PerformAction(const ui::Event& event) override; 42 bool PerformAction(const ui::Event& event) override;
42 43
43 // SessionStateObserver: 44 // SessionStateObserver:
44 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 45 void SessionStateChanged(SessionStateDelegate::SessionState state) override;
45 46
46 // TrayBackgroundView: 47 // TrayBackgroundView:
47 void ClickedOutsideBubble() override; 48 void ClickedOutsideBubble() override;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 89
89 // Weak pointer, will be parented by TrayContainer for its lifetime. 90 // Weak pointer, will be parented by TrayContainer for its lifetime.
90 views::ImageView* icon_; 91 views::ImageView* icon_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 93 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
93 }; 94 };
94 95
95 } // namespace ash 96 } // namespace ash
96 97
97 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 98 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698