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

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

Issue 219503003: Make keyboard controller a singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix root window controller unittets. 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
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine.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 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/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/status_area_widget.h" 8 #include "ash/system/status_area_widget.h"
9 #include "ash/system/tray/system_tray_notifier.h" 9 #include "ash/system/tray/system_tray_notifier.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 void VirtualKeyboardTray::HideBubbleWithView( 92 void VirtualKeyboardTray::HideBubbleWithView(
93 const views::TrayBubbleView* bubble_view) { 93 const views::TrayBubbleView* bubble_view) {
94 } 94 }
95 95
96 bool VirtualKeyboardTray::ClickedOutsideBubble() { 96 bool VirtualKeyboardTray::ClickedOutsideBubble() {
97 return false; 97 return false;
98 } 98 }
99 99
100 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) { 100 bool VirtualKeyboardTray::PerformAction(const ui::Event& event) {
101 Shell::GetInstance()->keyboard_controller()->ShowAndLockKeyboard(); 101 keyboard::KeyboardController::GetInstance()->ShowAndLockKeyboard();
102 return true; 102 return true;
103 } 103 }
104 104
105 void VirtualKeyboardTray::ButtonPressed(views::Button* sender, 105 void VirtualKeyboardTray::ButtonPressed(views::Button* sender,
106 const ui::Event& event) { 106 const ui::Event& event) {
107 DCHECK_EQ(button_, sender); 107 DCHECK_EQ(button_, sender);
108 PerformAction(event); 108 PerformAction(event);
109 } 109 }
110 110
111 void VirtualKeyboardTray::OnAccessibilityModeChanged( 111 void VirtualKeyboardTray::OnAccessibilityModeChanged(
112 AccessibilityNotificationVisibility notify) { 112 AccessibilityNotificationVisibility notify) {
113 SetVisible(Shell::GetInstance()->accessibility_delegate()-> 113 SetVisible(Shell::GetInstance()->accessibility_delegate()->
114 IsVirtualKeyboardEnabled()); 114 IsVirtualKeyboardEnabled());
115 } 115 }
116 116
117 } // namespace ash 117 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/chromeos/input_method/input_method_engine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698