Index: ui/base/ime/candidate_window.h |
diff --git a/chromeos/ime/candidate_window.h b/ui/base/ime/candidate_window.h |
similarity index 92% |
rename from chromeos/ime/candidate_window.h |
rename to ui/base/ime/candidate_window.h |
index d0f5f895feeb74aed3e5755ba0e1418f7d43e4ae..b2f3895e4e30c7e94e4f049696f8d15593487ce7 100644 |
--- a/chromeos/ime/candidate_window.h |
+++ b/ui/base/ime/candidate_window.h |
@@ -2,20 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROMEOS_IME_CANDIDATE_WINDOW_H_ |
-#define CHROMEOS_IME_CANDIDATE_WINDOW_H_ |
+#ifndef UI_BASE_IME_CANDIDATE_WINDOW_H_ |
+#define UI_BASE_IME_CANDIDATE_WINDOW_H_ |
#include <string> |
#include <vector> |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
-#include "chromeos/chromeos_export.h" |
+#include "ui/base/ui_base_export.h" |
-namespace chromeos { |
-namespace input_method { |
+namespace ui { |
Hiro Komatsu
2014/01/08 03:51:26
What do you think to add "ime" namespace? (i.e. u
Jun Mukai
2014/01/08 05:04:32
I am not so sure about the namespace policy. There
|
// CandidateWindow represents the structure of candidates generated from IME. |
-class CHROMEOS_EXPORT CandidateWindow { |
+class UI_BASE_EXPORT CandidateWindow { |
public: |
enum Orientation { |
HORIZONTAL = 0, |
@@ -121,7 +120,6 @@ class CHROMEOS_EXPORT CandidateWindow { |
DISALLOW_COPY_AND_ASSIGN(CandidateWindow); |
}; |
-} // namespace input_method |
-} // namespace chromeos |
+} // namespace ui |
-#endif // CHROMEOS_IME_CANDIDATE_WINDOW_H_ |
+#endif // UI_BASE_IME_CANDIDATE_WINDOW_H_ |