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

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

Issue 2948223002: Revert of Do not activate TrayBubbleView by default (Closed)
Patch Set: Created 3 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
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.cc ('k') | ash/system/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_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 <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 private: 77 private:
78 // ui::InputDeviceObserver: 78 // ui::InputDeviceObserver:
79 void OnTouchscreenDeviceConfigurationChanged() override; 79 void OnTouchscreenDeviceConfigurationChanged() override;
80 void OnStylusStateChanged(ui::StylusState stylus_state) override; 80 void OnStylusStateChanged(ui::StylusState stylus_state) override;
81 81
82 // views::TrayBubbleView::Delegate: 82 // views::TrayBubbleView::Delegate:
83 void BubbleViewDestroyed() override; 83 void BubbleViewDestroyed() override;
84 void OnMouseEnteredView() override; 84 void OnMouseEnteredView() override;
85 void OnMouseExitedView() override; 85 void OnMouseExitedView() override;
86 void RegisterAccelerators(const std::vector<ui::Accelerator>& accelerators,
87 views::TrayBubbleView* tray_bubble_view) override;
88 void UnregisterAllAccelerators(
89 views::TrayBubbleView* tray_bubble_view) override;
90 base::string16 GetAccessibleNameForBubble() override; 86 base::string16 GetAccessibleNameForBubble() override;
91 bool ShouldEnableExtraKeyboardAccessibility() override;
92 void HideBubble(const views::TrayBubbleView* bubble_view) override; 87 void HideBubble(const views::TrayBubbleView* bubble_view) override;
93 88
94 // PaletteToolManager::Delegate: 89 // PaletteToolManager::Delegate:
95 void OnActiveToolChanged() override; 90 void OnActiveToolChanged() override;
96 aura::Window* GetWindow() override; 91 aura::Window* GetWindow() override;
97 92
98 // Updates the tray icon from the palette tool manager. 93 // Updates the tray icon from the palette tool manager.
99 void UpdateTrayIcon(); 94 void UpdateTrayIcon();
100 95
101 // Sets the icon to visible if the palette can be used. 96 // Sets the icon to visible if the palette can be used.
(...skipping 26 matching lines...) Expand all
128 ScopedSessionObserver scoped_session_observer_; 123 ScopedSessionObserver scoped_session_observer_;
129 124
130 base::WeakPtrFactory<PaletteTray> weak_factory_; 125 base::WeakPtrFactory<PaletteTray> weak_factory_;
131 126
132 DISALLOW_COPY_AND_ASSIGN(PaletteTray); 127 DISALLOW_COPY_AND_ASSIGN(PaletteTray);
133 }; 128 };
134 129
135 } // namespace ash 130 } // namespace ash
136 131
137 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_ 132 #endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.cc ('k') | ash/system/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698