Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
|
tdanderson
2017/03/28 22:30:39
nit: please add BUG=686286 to the CL description a
Evan Stade
2017/03/28 22:47:39
done
tdanderson
2017/03/28 22:57:28
Hm, disregard, I think your CL title is sufficient
| |
| 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/chromeos/virtual_keyboard/virtual_keyboard_observer. h" | 9 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h" |
| 10 #include "ash/common/system/ime/ime_observer.h" | 10 #include "ash/common/system/ime/ime_observer.h" |
| 11 #include "ash/common/system/tray/ime_info.h" | 11 #include "ash/common/system/tray/ime_info.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 // Returns true if the menu should show emoji, handwriting and voice buttons | 52 // Returns true if the menu should show emoji, handwriting and voice buttons |
| 53 // on the bottom. Otherwise, the menu will show a 'Customize...' bottom row | 53 // on the bottom. Otherwise, the menu will show a 'Customize...' bottom row |
| 54 // for non-MD UI, and a Settings button in the title row for MD. | 54 // for non-MD UI, and a Settings button in the title row for MD. |
| 55 bool ShouldShowEmojiHandwritingVoiceButtons() const; | 55 bool ShouldShowEmojiHandwritingVoiceButtons() const; |
| 56 | 56 |
| 57 // Returns whether the virtual keyboard toggle should be shown in shown in the | 57 // Returns whether the virtual keyboard toggle should be shown in shown in the |
| 58 // opt-in IME menu. | 58 // opt-in IME menu. |
| 59 bool ShouldShowKeyboardToggle() const; | 59 bool ShouldShowKeyboardToggle() const; |
| 60 | 60 |
| 61 // TrayBackgroundView: | 61 // TrayBackgroundView: |
| 62 void SetShelfAlignment(ShelfAlignment alignment) override; | |
| 63 base::string16 GetAccessibleNameForTray() override; | 62 base::string16 GetAccessibleNameForTray() override; |
| 64 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; | 63 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; |
| 65 void ClickedOutsideBubble() override; | 64 void ClickedOutsideBubble() override; |
| 66 bool PerformAction(const ui::Event& event) override; | 65 bool PerformAction(const ui::Event& event) override; |
| 67 | 66 |
| 68 // IMEObserver: | 67 // IMEObserver: |
| 69 void OnIMERefresh() override; | 68 void OnIMERefresh() override; |
| 70 void OnIMEMenuActivationChanged(bool is_activated) override; | 69 void OnIMEMenuActivationChanged(bool is_activated) override; |
| 71 | 70 |
| 72 // views::TrayBubbleView::Delegate: | 71 // views::TrayBubbleView::Delegate: |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 bool should_block_shelf_auto_hide_; | 108 bool should_block_shelf_auto_hide_; |
| 110 bool keyboard_suppressed_; | 109 bool keyboard_suppressed_; |
| 111 bool show_bubble_after_keyboard_hidden_; | 110 bool show_bubble_after_keyboard_hidden_; |
| 112 | 111 |
| 113 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); | 112 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); |
| 114 }; | 113 }; |
| 115 | 114 |
| 116 } // namespace ash | 115 } // namespace ash |
| 117 | 116 |
| 118 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ | 117 #endif // ASH_COMMON_SYSTEM_CHROMEOS_IME_MENU_IME_MENU_TRAY_H_ |
| OLD | NEW |