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

Side by Side Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray.h

Issue 2420393002: Block shelf auto hidden when opt-in IME menu is shown. (Closed)
Patch Set: Block shelf auto hide. Created 4 years, 2 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 | « no previous file | ash/common/system/chromeos/ime_menu/ime_menu_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_IME_MENU_IME_MENU_TRAY_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/ime/ime_observer.h" 9 #include "ash/common/system/ime/ime_observer.h"
10 #include "ash/common/system/tray/ime_info.h" 10 #include "ash/common/system/tray/ime_info.h"
(...skipping 28 matching lines...) Expand all
39 // Hides the IME menu bubble and lowlights the button. 39 // Hides the IME menu bubble and lowlights the button.
40 void HideImeMenuBubble(); 40 void HideImeMenuBubble();
41 41
42 // Returns true if the IME menu bubble has been shown. 42 // Returns true if the IME menu bubble has been shown.
43 bool IsImeMenuBubbleShown(); 43 bool IsImeMenuBubbleShown();
44 44
45 // Shows the virtual keyboard with the given keyset: emoji, handwriting or 45 // Shows the virtual keyboard with the given keyset: emoji, handwriting or
46 // voice. 46 // voice.
47 void ShowKeyboardWithKeyset(const std::string& keyset); 47 void ShowKeyboardWithKeyset(const std::string& keyset);
48 48
49 // Returns true if it should block the auto hide behavior of the shelf.
50 bool ShouldBlockShelfAutoHide() const;
51
49 // TrayBackgroundView: 52 // TrayBackgroundView:
50 void SetShelfAlignment(ShelfAlignment alignment) override; 53 void SetShelfAlignment(ShelfAlignment alignment) override;
51 base::string16 GetAccessibleNameForTray() override; 54 base::string16 GetAccessibleNameForTray() override;
52 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 55 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
53 void ClickedOutsideBubble() override; 56 void ClickedOutsideBubble() override;
54 bool PerformAction(const ui::Event& event) override; 57 bool PerformAction(const ui::Event& event) override;
55 58
56 // IMEObserver: 59 // IMEObserver:
57 void OnIMERefresh() override; 60 void OnIMERefresh() override;
58 void OnIMEMenuActivationChanged(bool is_activated) override; 61 void OnIMEMenuActivationChanged(bool is_activated) override;
(...skipping 25 matching lines...) Expand all
84 void UpdateTrayLabel(); 87 void UpdateTrayLabel();
85 88
86 // Bubble for default and detailed views. 89 // Bubble for default and detailed views.
87 std::unique_ptr<TrayBubbleWrapper> bubble_; 90 std::unique_ptr<TrayBubbleWrapper> bubble_;
88 ImeListView* ime_list_view_; 91 ImeListView* ime_list_view_;
89 92
90 views::Label* label_; 93 views::Label* label_;
91 IMEInfo current_ime_; 94 IMEInfo current_ime_;
92 bool show_keyboard_; 95 bool show_keyboard_;
93 bool force_show_keyboard_; 96 bool force_show_keyboard_;
97 bool should_block_shelf_auto_hide_;
94 98
95 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); 99 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
96 }; 100 };
97 101
98 } // namespace ash 102 } // namespace ash
99 103
100 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ 104 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698