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

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

Issue 2557593009: Fix Chrome crashes on calling OnTrayVisibilityChange (Closed)
Patch Set: new approach Created 4 years 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 | « no previous file | ash/common/system/chromeos/palette/palette_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 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
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // ShellObserver: 52 // ShellObserver:
53 void OnLockStateChanged(bool locked) override; 53 void OnLockStateChanged(bool locked) override;
54 54
55 // TrayBackgroundView: 55 // TrayBackgroundView:
56 void ClickedOutsideBubble() override; 56 void ClickedOutsideBubble() override;
57 base::string16 GetAccessibleNameForTray() override; 57 base::string16 GetAccessibleNameForTray() override;
58 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 58 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
59 void SetShelfAlignment(ShelfAlignment alignment) override; 59 void SetShelfAlignment(ShelfAlignment alignment) override;
60 void AnchorUpdated() override; 60 void AnchorUpdated() override;
61 void Initialize() override;
61 62
62 // PaletteToolManager::Delegate: 63 // PaletteToolManager::Delegate:
63 void HidePalette() override; 64 void HidePalette() override;
64 void HidePaletteImmediately() override; 65 void HidePaletteImmediately() override;
65 void RecordPaletteOptionsUsage(PaletteTrayOptions option) override; 66 void RecordPaletteOptionsUsage(PaletteTrayOptions option) override;
66 void RecordPaletteModeCancellation(PaletteModeCancelType type) override; 67 void RecordPaletteModeCancellation(PaletteModeCancelType type) override;
67 68
68 // Returns true if the shelf should not autohide. 69 // Returns true if the shelf should not autohide.
69 bool ShouldBlockShelfAutoHide() const; 70 bool ShouldBlockShelfAutoHide() const;
70 71
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 int num_actions_in_bubble_ = 0; 136 int num_actions_in_bubble_ = 0;
136 137
137 base::WeakPtrFactory<PaletteTray> weak_factory_; 138 base::WeakPtrFactory<PaletteTray> weak_factory_;
138 139
139 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 140 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
140 }; 141 };
141 142
142 } // namespace ash 143 } // namespace ash
143 144
144 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_ 145 #endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698