OLD | NEW |
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 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 5 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
6 | 6 |
7 #include "ash/keyboard/keyboard_ui.h" | 7 #include "ash/keyboard/keyboard_ui.h" |
8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
9 #include "ash/shelf/shelf_constants.h" | 9 #include "ash/shelf/shelf_constants.h" |
10 #include "ash/shelf/shelf_util.h" | 10 #include "ash/shelf/shelf_util.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 | 77 |
78 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() { | 78 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() { |
79 return l10n_util::GetStringUTF16( | 79 return l10n_util::GetStringUTF16( |
80 IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME); | 80 IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME); |
81 } | 81 } |
82 | 82 |
83 void VirtualKeyboardTray::HideBubbleWithView( | 83 void VirtualKeyboardTray::HideBubbleWithView( |
84 const views::TrayBubbleView* bubble_view) { | 84 const views::TrayBubbleView* bubble_view) { |
85 } | 85 } |
86 | 86 |
87 bool VirtualKeyboardTray::ClickedOutsideBubble() { | 87 void VirtualKeyboardTray::ClickedOutsideBubble() {} |
88 return false; | |
89 } | |
90 | 88 |
91 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) { | 89 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) { |
92 Shell::GetInstance()->keyboard_ui()->Show(); | 90 Shell::GetInstance()->keyboard_ui()->Show(); |
93 return true; | 91 return true; |
94 } | 92 } |
95 | 93 |
96 void VirtualKeyboardTray::ButtonPressed(views::Button* sender, | 94 void VirtualKeyboardTray::ButtonPressed(views::Button* sender, |
97 const ui::Event& event) { | 95 const ui::Event& event) { |
98 DCHECK_EQ(button_, sender); | 96 DCHECK_EQ(button_, sender); |
99 PerformAction(event); | 97 PerformAction(event); |
100 } | 98 } |
101 | 99 |
102 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { | 100 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { |
103 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); | 101 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); |
104 } | 102 } |
105 | 103 |
106 } // namespace ash | 104 } // namespace ash |
OLD | NEW |