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

Unified Diff: ui/base/ime/candidate_window.cc

Issue 132453002: Moves CandidateWindow model to ui/base/ime (2nd) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months 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
« no previous file with comments | « ui/base/ime/candidate_window.h ('k') | ui/base/ime/candidate_window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ui/base/ime/candidate_window.h ('k') | ui/base/ime/candidate_window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698