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

Unified Diff: ui/base/ime/chromeos/ime_keyboard.h

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, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/chromeos/fake_input_method_delegate.cc ('k') | ui/base/ime/chromeos/ime_keyboard.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/ime_keyboard.h
diff --git a/chromeos/ime/ime_keyboard.h b/ui/base/ime/chromeos/ime_keyboard.h
similarity index 90%
rename from chromeos/ime/ime_keyboard.h
rename to ui/base/ime/chromeos/ime_keyboard.h
index 3fcdb5d847a8a3a1b51d50c44a16187e8c6d3046..5c84fffc3e5d0a168703ebb8e84c94f707ffebfd 100644
--- a/chromeos/ime/ime_keyboard.h
+++ b/ui/base/ime/chromeos/ime_keyboard.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_IME_IME_KEYBOARD_H_
-#define CHROMEOS_IME_IME_KEYBOARD_H_
+#ifndef UI_BASE_IME_CHROMEOS_IME_KEYBOARD_H_
+#define UI_BASE_IME_CHROMEOS_IME_KEYBOARD_H_
#include <string>
#include <vector>
#include "base/basictypes.h"
#include "base/observer_list.h"
-#include "chromeos/chromeos_export.h"
+#include "ui/base/ui_base_export.h"
namespace chromeos {
namespace input_method {
@@ -35,7 +35,7 @@ enum ModifierKey {
class InputMethodUtil;
-class CHROMEOS_EXPORT ImeKeyboard {
+class UI_BASE_EXPORT ImeKeyboard {
public:
class Observer {
public:
@@ -98,20 +98,20 @@ class CHROMEOS_EXPORT ImeKeyboard {
// Returns true if auto repeat is enabled. This function is protected: for
// testability.
- static CHROMEOS_EXPORT bool GetAutoRepeatEnabledForTesting();
+ static UI_BASE_EXPORT bool GetAutoRepeatEnabledForTesting();
// On success, set current auto repeat rate on |out_rate| and returns true.
// Returns false otherwise. This function is protected: for testability.
- static CHROMEOS_EXPORT bool GetAutoRepeatRateForTesting(
+ static UI_BASE_EXPORT bool GetAutoRepeatRateForTesting(
AutoRepeatRate* out_rate);
// Returns false if |layout_name| contains a bad character.
- static CHROMEOS_EXPORT bool CheckLayoutNameForTesting(
+ static UI_BASE_EXPORT bool CheckLayoutNameForTesting(
const std::string& layout_name);
// Note: At this moment, classes other than InputMethodManager should not
// instantiate the ImeKeyboard class.
- static ImeKeyboard* Create();
+ static UI_BASE_EXPORT ImeKeyboard* Create();
bool caps_lock_is_enabled_;
std::string last_layout_;
@@ -123,4 +123,4 @@ class CHROMEOS_EXPORT ImeKeyboard {
} // namespace input_method
} // namespace chromeos
-#endif // CHROMEOS_IME_IME_KEYBOARD_H_
+#endif // UI_BASE_IME_CHROMEOS_IME_KEYBOARD_H_
« no previous file with comments | « ui/base/ime/chromeos/fake_input_method_delegate.cc ('k') | ui/base/ime/chromeos/ime_keyboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698