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

Side by Side Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h

Issue 2103113003: Fix shelf layout when switching from left-aligned shelf to right-aligned shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
6 #define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 6 #define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
7 7
8 #include "ash/common/keyboard/keyboard_ui_observer.h" 8 #include "ash/common/keyboard/keyboard_ui_observer.h"
9 #include "ash/common/system/tray/tray_background_view.h" 9 #include "ash/common/system/tray/tray_background_view.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/views/controls/button/button.h" 11 #include "ui/views/controls/button/button.h"
12 12
13 namespace views { 13 namespace views {
14 class ImageButton; 14 class ImageButton;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
19 // TODO(sky): make this visible on non-chromeos platforms. 19 // TODO(sky): make this visible on non-chromeos platforms.
20 class VirtualKeyboardTray : public TrayBackgroundView, 20 class VirtualKeyboardTray : public TrayBackgroundView,
21 public views::ButtonListener, 21 public views::ButtonListener,
22 public KeyboardUIObserver { 22 public KeyboardUIObserver {
23 public: 23 public:
24 explicit VirtualKeyboardTray(WmShelf* wm_shelf); 24 explicit VirtualKeyboardTray(WmShelf* wm_shelf);
25 ~VirtualKeyboardTray() override; 25 ~VirtualKeyboardTray() override;
26 26
27 // TrayBackgroundView: 27 // TrayBackgroundView:
28 void SetShelfAlignment(ShelfAlignment alignment) override; 28 void SetShelfAlignment(ShelfAlignment alignment,
29 const gfx::Insets& insets) override;
29 base::string16 GetAccessibleNameForTray() override; 30 base::string16 GetAccessibleNameForTray() override;
30 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override; 31 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
31 void ClickedOutsideBubble() override; 32 void ClickedOutsideBubble() override;
32 bool PerformAction(const ui::Event& event) override; 33 bool PerformAction(const ui::Event& event) override;
33 34
34 // views::ButtonListener: 35 // views::ButtonListener:
35 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 36 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
36 37
37 // KeyboardUIObserver: 38 // KeyboardUIObserver:
38 void OnKeyboardEnabledStateChanged(bool new_value) override; 39 void OnKeyboardEnabledStateChanged(bool new_value) override;
39 40
40 private: 41 private:
41 views::ImageButton* button_; // Not owned. 42 views::ImageButton* button_; // Not owned.
42 43
43 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); 44 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray);
44 }; 45 };
45 46
46 } // namespace ash 47 } // namespace ash
47 48
48 #endif // ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 49 #endif // ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698