OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h" | 5 #include "ui/keyboard/keyboard_controller.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "content/public/browser/render_widget_host.h" | 9 #include "content/public/browser/render_widget_host.h" |
10 #include "content/public/browser/render_widget_host_iterator.h" | 10 #include "content/public/browser/render_widget_host_iterator.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 #if defined(OS_CHROMEOS) | 122 #if defined(OS_CHROMEOS) |
123 if (!base::SysInfo::IsRunningOnChromeOS()) | 123 if (!base::SysInfo::IsRunningOnChromeOS()) |
124 return; | 124 return; |
125 CommandLine command( | 125 CommandLine command( |
126 base::FilePath("/opt/google/touchscreen/toggle_touch_event_logging")); | 126 base::FilePath("/opt/google/touchscreen/toggle_touch_event_logging")); |
127 if (enable) | 127 if (enable) |
128 command.AppendArg("1"); | 128 command.AppendArg("1"); |
129 else | 129 else |
130 command.AppendArg("0"); | 130 command.AppendArg("0"); |
131 VLOG(1) << "Running " << command.GetCommandLineString(); | 131 VLOG(1) << "Running " << command.GetCommandLineString(); |
132 base::LaunchProcess(command, base::LaunchOptions(), NULL); | 132 base::LaunchOptions options; |
| 133 options.wait = true; |
| 134 base::LaunchProcess(command, options, NULL); |
133 #endif | 135 #endif |
134 } | 136 } |
135 | 137 |
136 } // namespace | 138 } // namespace |
137 | 139 |
138 namespace keyboard { | 140 namespace keyboard { |
139 | 141 |
140 // Observer for both keyboard show and hide animations. It should be owned by | 142 // Observer for both keyboard show and hide animations. It should be owned by |
141 // KeyboardController. | 143 // KeyboardController. |
142 class CallbackAnimationObserver : public ui::LayerAnimationObserver { | 144 class CallbackAnimationObserver : public ui::LayerAnimationObserver { |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 // background during animation. | 461 // background during animation. |
460 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds()); | 462 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds()); |
461 proxy_->EnsureCaretInWorkArea(); | 463 proxy_->EnsureCaretInWorkArea(); |
462 } | 464 } |
463 | 465 |
464 void KeyboardController::HideAnimationFinished() { | 466 void KeyboardController::HideAnimationFinished() { |
465 proxy_->HideKeyboardContainer(container_.get()); | 467 proxy_->HideKeyboardContainer(container_.get()); |
466 } | 468 } |
467 | 469 |
468 } // namespace keyboard | 470 } // namespace keyboard |
OLD | NEW |