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

Side by Side Diff: ash/system/ime_menu/ime_menu_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 | « no previous file | ash/system/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_SYSTEM_IME_MENU_IME_MENU_TRAY_H_ 5 #ifndef ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
6 #define ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_ 6 #define ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/ime/ime_observer.h" 9 #include "ash/system/ime/ime_observer.h"
10 #include "ash/system/tray/ime_info.h" 10 #include "ash/system/tray/ime_info.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool PerformAction(const ui::Event& event) override; 65 bool PerformAction(const ui::Event& event) override;
66 66
67 // IMEObserver: 67 // IMEObserver:
68 void OnIMERefresh() override; 68 void OnIMERefresh() override;
69 void OnIMEMenuActivationChanged(bool is_activated) override; 69 void OnIMEMenuActivationChanged(bool is_activated) override;
70 70
71 // views::TrayBubbleView::Delegate: 71 // views::TrayBubbleView::Delegate:
72 void BubbleViewDestroyed() override; 72 void BubbleViewDestroyed() override;
73 void OnMouseEnteredView() override; 73 void OnMouseEnteredView() override;
74 void OnMouseExitedView() override; 74 void OnMouseExitedView() override;
75 void RegisterAccelerators(const std::vector<ui::Accelerator>& accelerators,
76 views::TrayBubbleView* tray_bubble_view) override;
77 void UnregisterAllAccelerators(
78 views::TrayBubbleView* tray_bubble_view) override;
79 base::string16 GetAccessibleNameForBubble() override; 75 base::string16 GetAccessibleNameForBubble() override;
80 bool ShouldEnableExtraKeyboardAccessibility() override;
81 void HideBubble(const views::TrayBubbleView* bubble_view) override; 76 void HideBubble(const views::TrayBubbleView* bubble_view) override;
82 77
83 // keyboard::KeyboardControllerObserver: 78 // keyboard::KeyboardControllerObserver:
84 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; 79 void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
85 void OnKeyboardClosed() override; 80 void OnKeyboardClosed() override;
86 void OnKeyboardHidden() override; 81 void OnKeyboardHidden() override;
87 82
88 // VirtualKeyboardObserver: 83 // VirtualKeyboardObserver:
89 void OnKeyboardSuppressionChanged(bool suppressed) override; 84 void OnKeyboardSuppressionChanged(bool suppressed) override;
90 85
(...skipping 24 matching lines...) Expand all
115 bool show_bubble_after_keyboard_hidden_; 110 bool show_bubble_after_keyboard_hidden_;
116 111
117 base::WeakPtrFactory<ImeMenuTray> weak_ptr_factory_; 112 base::WeakPtrFactory<ImeMenuTray> weak_ptr_factory_;
118 113
119 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray); 114 DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
120 }; 115 };
121 116
122 } // namespace ash 117 } // namespace ash
123 118
124 #endif // ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_ 119 #endif // ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698