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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. 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
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 "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
12 #include "chromeos/chromeos_switches.h" 12 #include "chromeos/chromeos_switches.h"
13 #include "chromeos/ime/ime_keyboard.h"
14 #include "content/public/browser/web_ui.h" 13 #include "content/public/browser/web_ui.h"
14 #include "ui/base/ime/chromeos/ime_keyboard.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 16
17 #if !defined(USE_ATHENA) 17 #if !defined(USE_ATHENA)
18 #include "ash/new_window_delegate.h" 18 #include "ash/new_window_delegate.h"
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #endif 20 #endif
21 21
22 namespace { 22 namespace {
23 const struct ModifierKeysSelectItem { 23 const struct ModifierKeysSelectItem {
24 int message_id; 24 int message_id;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 #if !defined(USE_ATHENA) 162 #if !defined(USE_ATHENA)
163 // Athena doesn't have ash::Shell and its new_window_delegate so keyboard 163 // Athena doesn't have ash::Shell and its new_window_delegate so keyboard
164 // shortcut overlays are not supported. 164 // shortcut overlays are not supported.
165 // TODO(mukai): re-enable this. 165 // TODO(mukai): re-enable this.
166 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay(); 166 ash::Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
167 #endif 167 #endif
168 } 168 }
169 169
170 } // namespace options 170 } // namespace options
171 } // namespace chromeos 171 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698