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

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | ash/system/chromeos/tray_caps_lock.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "ui/compositor/layer_animation_sequence.h" 61 #include "ui/compositor/layer_animation_sequence.h"
62 #include "ui/compositor/layer_animator.h" 62 #include "ui/compositor/layer_animator.h"
63 #include "ui/events/event.h" 63 #include "ui/events/event.h"
64 #include "ui/events/keycodes/keyboard_codes.h" 64 #include "ui/events/keycodes/keyboard_codes.h"
65 #include "ui/gfx/screen.h" 65 #include "ui/gfx/screen.h"
66 #include "ui/views/controls/webview/webview.h" 66 #include "ui/views/controls/webview/webview.h"
67 67
68 #if defined(OS_CHROMEOS) 68 #if defined(OS_CHROMEOS)
69 #include "ash/system/chromeos/keyboard_brightness_controller.h" 69 #include "ash/system/chromeos/keyboard_brightness_controller.h"
70 #include "base/sys_info.h" 70 #include "base/sys_info.h"
71 #include "ui/base/ime/chromeos/ime_keyboard.h" 71 #include "chromeos/ime/ime_keyboard.h"
72 #include "ui/base/ime/chromeos/input_method_manager.h" 72 #include "chromeos/ime/input_method_manager.h"
73 #endif // defined(OS_CHROMEOS) 73 #endif // defined(OS_CHROMEOS)
74 74
75 namespace ash { 75 namespace ash {
76 namespace { 76 namespace {
77 77
78 using base::UserMetricsAction; 78 using base::UserMetricsAction;
79 79
80 bool HandleAccessibleFocusCycle(bool reverse) { 80 bool HandleAccessibleFocusCycle(bool reverse) {
81 if (reverse) { 81 if (reverse) {
82 base::RecordAction(UserMetricsAction("Accel_Accessible_Focus_Previous")); 82 base::RecordAction(UserMetricsAction("Accel_Accessible_Focus_Previous"));
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 } 1143 }
1144 1144
1145 void AcceleratorController::SetKeyboardBrightnessControlDelegate( 1145 void AcceleratorController::SetKeyboardBrightnessControlDelegate(
1146 scoped_ptr<KeyboardBrightnessControlDelegate> 1146 scoped_ptr<KeyboardBrightnessControlDelegate>
1147 keyboard_brightness_control_delegate) { 1147 keyboard_brightness_control_delegate) {
1148 keyboard_brightness_control_delegate_ = 1148 keyboard_brightness_control_delegate_ =
1149 keyboard_brightness_control_delegate.Pass(); 1149 keyboard_brightness_control_delegate.Pass();
1150 } 1150 }
1151 1151
1152 } // namespace ash 1152 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/chromeos/tray_caps_lock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698