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

Unified Diff: ui/chromeos/ime/candidate_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_view.h
diff --git a/ash/ime/candidate_view.h b/ui/chromeos/ime/candidate_view.h
similarity index 91%
rename from ash/ime/candidate_view.h
rename to ui/chromeos/ime/candidate_view.h
index 6b1c650ec64ba2b4225148a5920e604fb66e5521..d781399e28bad5a75655dc064e8dee5e8577cb81 100644
--- a/ash/ime/candidate_view.h
+++ b/ui/chromeos/ime/candidate_view.h
@@ -5,18 +5,18 @@
#ifndef ASH_IME_CANDIDATE_VIEW_H_
#define ASH_IME_CANDIDATE_VIEW_H_
-#include "ash/ash_export.h"
#include "base/gtest_prod_util.h"
#include "ui/base/ime/candidate_window.h"
+#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/views/controls/button/custom_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/view.h"
-namespace ash {
+namespace ui {
namespace ime {
// CandidateView renderes a row of a candidate.
-class ASH_EXPORT CandidateView : public views::CustomButton {
+class UI_CHROMEOS_EXPORT CandidateView : public views::CustomButton {
public:
CandidateView(views::ButtonListener* listener,
ui::CandidateWindow::Orientation orientation);
@@ -70,6 +70,6 @@ class ASH_EXPORT CandidateView : public views::CustomButton {
};
} // namespace ime
-} // namespace ash
+} // namespace ui
-#endif // ASH_IME_CANDIDATE_VIEW_H_
+#endif // UI_CHROMEOS_IME_CANDIDATE_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698