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

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

Issue 240443006: Remove native VK window height logic and wait for resizeTo to setup VK window height (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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 #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/shelf/shelf_constants.h" 7 #include "ash/shelf/shelf_constants.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/system/status_area_widget.h" 9 #include "ash/system/status_area_widget.h"
10 #include "ash/system/tray/system_tray_notifier.h" 10 #include "ash/system/tray/system_tray_notifier.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 void VirtualKeyboardTray::HideBubbleWithView( 93 void VirtualKeyboardTray::HideBubbleWithView(
94 const views::TrayBubbleView* bubble_view) { 94 const views::TrayBubbleView* bubble_view) {
95 } 95 }
96 96
97 bool VirtualKeyboardTray::ClickedOutsideBubble() { 97 bool VirtualKeyboardTray::ClickedOutsideBubble() {
98 return false; 98 return false;
99 } 99 }
100 100
101 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) { 101 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) {
102 keyboard::KeyboardController::GetInstance()->ShowAndLockKeyboard(); 102 keyboard::KeyboardController::GetInstance()->ShowKeyboard(true);
103 return true; 103 return true;
104 } 104 }
105 105
106 void VirtualKeyboardTray::ButtonPressed(views::Button* sender, 106 void VirtualKeyboardTray::ButtonPressed(views::Button* sender,
107 const ui::Event& event) { 107 const ui::Event& event) {
108 DCHECK_EQ(button_, sender); 108 DCHECK_EQ(button_, sender);
109 PerformAction(event); 109 PerformAction(event);
110 } 110 }
111 111
112 void VirtualKeyboardTray::OnAccessibilityModeChanged( 112 void VirtualKeyboardTray::OnAccessibilityModeChanged(
113 AccessibilityNotificationVisibility notify) { 113 AccessibilityNotificationVisibility notify) {
114 SetVisible(Shell::GetInstance()->accessibility_delegate()-> 114 SetVisible(Shell::GetInstance()->accessibility_delegate()->
115 IsVirtualKeyboardEnabled()); 115 IsVirtualKeyboardEnabled());
116 } 116 }
117 117
118 } // namespace ash 118 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698