| Index: ui/chromeos/ime/candidate_window_view.cc
|
| diff --git a/ash/ime/candidate_window_view.cc b/ui/chromeos/ime/candidate_window_view.cc
|
| similarity index 98%
|
| rename from ash/ime/candidate_window_view.cc
|
| rename to ui/chromeos/ime/candidate_window_view.cc
|
| index 66b54d5852fd11cbc58a4a35fb7e38e2840d7a86..823fda5d4b35a810c01b846ac2acf8bb0862f8be 100644
|
| --- a/ash/ime/candidate_window_view.cc
|
| +++ b/ui/chromeos/ime/candidate_window_view.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/ime/candidate_window_view.h"
|
| +#include "ui/chromeos/ime/candidate_window_view.h"
|
|
|
| #include <string>
|
|
|
| -#include "ash/ime/candidate_view.h"
|
| -#include "ash/ime/candidate_window_constants.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "ui/chromeos/ime/candidate_view.h"
|
| +#include "ui/chromeos/ime/candidate_window_constants.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/screen.h"
|
| #include "ui/native_theme/native_theme.h"
|
| @@ -20,7 +20,7 @@
|
| #include "ui/views/layout/fill_layout.h"
|
| #include "ui/wm/core/window_animations.h"
|
|
|
| -namespace ash {
|
| +namespace ui {
|
| namespace ime {
|
|
|
| namespace {
|
| @@ -403,4 +403,4 @@ void CandidateWindowView::ButtonPressed(views::Button* sender,
|
| }
|
|
|
| } // namespace ime
|
| -} // namespace ash
|
| +} // namespace ui
|
|
|