| Index: ui/base/ime/candidate_window.cc
|
| diff --git a/chromeos/ime/candidate_window.cc b/ui/base/ime/candidate_window.cc
|
| similarity index 90%
|
| rename from chromeos/ime/candidate_window.cc
|
| rename to ui/base/ime/candidate_window.cc
|
| index 9fb22ea436b1a0151f2c83997c9597485f58fdc4..bf287ff54a8f3e7cc1d837a822ac33634b5b7aa8 100644
|
| --- a/chromeos/ime/candidate_window.cc
|
| +++ b/ui/base/ime/candidate_window.cc
|
| @@ -1,15 +1,14 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/ime/candidate_window.h"
|
| +#include "ui/base/ime/candidate_window.h"
|
|
|
| #include <string>
|
| #include "base/logging.h"
|
| #include "base/values.h"
|
|
|
| -namespace chromeos {
|
| -namespace input_method {
|
| +namespace ui {
|
|
|
| namespace {
|
| // The default entry number of a page in CandidateWindow.
|
| @@ -74,5 +73,4 @@ CandidateWindow::Entry::Entry() {
|
| CandidateWindow::Entry::~Entry() {
|
| }
|
|
|
| -} // namespace input_method
|
| -} // namespace chromeos
|
| +} // namespace ui
|
|
|