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

Side by Side Diff: ash/system/palette/palette_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
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_SYSTEM_PALETTE_PALETTE_TRAY_H_ 5 #ifndef ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
6 #define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 6 #define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
7 7
8 #include <map>
9 #include <memory> 8 #include <memory>
10 9
11 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
12 #include "ash/palette_delegate.h" 11 #include "ash/palette_delegate.h"
13 #include "ash/session/session_state_observer.h" 12 #include "ash/session/session_state_observer.h"
14 #include "ash/shell_observer.h" 13 #include "ash/shell_observer.h"
15 #include "ash/system/palette/palette_tool_manager.h" 14 #include "ash/system/palette/palette_tool_manager.h"
16 #include "ash/system/tray/tray_background_view.h" 15 #include "ash/system/tray/tray_background_view.h"
17 #include "base/macros.h" 16 #include "base/macros.h"
18 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // SessionStateObserver: 50 // SessionStateObserver:
52 void SessionStateChanged(session_manager::SessionState state) override; 51 void SessionStateChanged(session_manager::SessionState state) override;
53 52
54 // ShellObserver: 53 // ShellObserver:
55 void OnLockStateChanged(bool locked) override; 54 void OnLockStateChanged(bool locked) override;
56 55
57 // TrayBackgroundView: 56 // TrayBackgroundView:
58 void ClickedOutsideBubble() override; 57 void ClickedOutsideBubble() override;
59 base::string16 GetAccessibleNameForTray() override; 58 base::string16 GetAccessibleNameForTray() override;
60 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 59 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
61 void SetShelfAlignment(ShelfAlignment alignment) override;
62 void AnchorUpdated() override; 60 void AnchorUpdated() override;
63 void Initialize() override; 61 void Initialize() override;
64 62
65 // PaletteToolManager::Delegate: 63 // PaletteToolManager::Delegate:
66 void HidePalette() override; 64 void HidePalette() override;
67 void HidePaletteImmediately() override; 65 void HidePaletteImmediately() override;
68 void RecordPaletteOptionsUsage(PaletteTrayOptions option) override; 66 void RecordPaletteOptionsUsage(PaletteTrayOptions option) override;
69 void RecordPaletteModeCancellation(PaletteModeCancelType type) override; 67 void RecordPaletteModeCancellation(PaletteModeCancelType type) override;
70 68
71 // Returns true if the shelf should not autohide. 69 // Returns true if the shelf should not autohide.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 int num_actions_in_bubble_ = 0; 133 int num_actions_in_bubble_ = 0;
136 134
137 base::WeakPtrFactory<PaletteTray> weak_factory_; 135 base::WeakPtrFactory<PaletteTray> weak_factory_;
138 136
139 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 137 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
140 }; 138 };
141 139
142 } // namespace ash 140 } // namespace ash
143 141
144 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 142 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698