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

Unified Diff: ui/chromeos/ime/infolist_window.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/infolist_window.h
diff --git a/ash/ime/infolist_window.h b/ui/chromeos/ime/infolist_window.h
similarity index 83%
rename from ash/ime/infolist_window.h
rename to ui/chromeos/ime/infolist_window.h
index 535f0251b0d35fc0a729cf323341bed0bf5d6b02..bf31a82f52b44ba099f188c1e747539d0196fc7f 100644
--- a/ash/ime/infolist_window.h
+++ b/ui/chromeos/ime/infolist_window.h
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_IME_INFOLIST_WINDOW_H_
-#define ASH_IME_INFOLIST_WINDOW_H_
+#ifndef UI_CHROMEOS_IME_INFOLIST_WINDOW_H_
+#define UI_CHROMEOS_IME_INFOLIST_WINDOW_H_
#include <string>
#include <vector>
-#include "ash/ash_export.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/timer/timer.h"
#include "ui/base/ime/infolist_entry.h"
+#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/gfx/font_list.h"
#include "ui/views/bubble/bubble_delegate.h"
-namespace ash {
+namespace ui {
namespace ime {
class InfolistEntryView;
// A widget delegate representing the infolist window UI.
-class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView {
+class UI_CHROMEOS_EXPORT InfolistWindow : public views::BubbleDelegateView {
public:
InfolistWindow(views::View* candidate_window,
const std::vector<ui::InfolistEntry>& entries);
@@ -59,6 +59,6 @@ class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView {
};
} // namespace ime
-} // namespace ash
+} // namespace ui
-#endif // ASH_IME_INFOLIST_WINDOW_H_
+#endif // UI_CHROMEOS_IME_INFOLIST_WINDOW_H_

Powered by Google App Engine
This is Rietveld 408576698