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

Unified Diff: ui/chromeos/ime/candidate_window_view.h

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: 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
Index: ui/chromeos/ime/candidate_window_view.h
diff --git a/ash/ime/candidate_window_view.h b/ui/chromeos/ime/candidate_window_view.h
similarity index 92%
rename from ash/ime/candidate_window_view.h
rename to ui/chromeos/ime/candidate_window_view.h
index 99800f8efb831cebf220248cf5a6697b3df504b6..4f8efb80206def1e058bf780cf298082bf365267 100644
--- a/ash/ime/candidate_window_view.h
+++ b/ui/chromeos/ime/candidate_window_view.h
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_IME_CANDIDATE_WINDOW_VIEW_H_
-#define ASH_IME_CANDIDATE_WINDOW_VIEW_H_
+#ifndef UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_
+#define UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_
-#include "ash/ash_export.h"
#include "ui/base/ime/candidate_window.h"
+#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
-namespace ash {
+namespace ui {
namespace ime {
class CandidateView;
class InformationTextArea;
// CandidateWindowView is the main container of the candidate window UI.
-class ASH_EXPORT CandidateWindowView : public views::BubbleDelegateView,
+class UI_CHROMEOS_EXPORT CandidateWindowView : public views::BubbleDelegateView,
public views::ButtonListener {
public:
// The object can be monitored by the observer.
@@ -128,6 +128,6 @@ class ASH_EXPORT CandidateWindowView : public views::BubbleDelegateView,
};
} // namespace ime
-} // namespace ash
+} // namespace ui
-#endif // ASH_IME_CANDIDATE_WINDOW_VIEW_H_
+#endif // UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698