summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 06:15:40 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 06:15:40 +0000
commitf66333c798f7b252477fae4ef8827dc2cba7dbce (patch)
tree5761068201c632ceb683f0cdb67ed43cfedf8160
parent4fba649e127a7e1ea6a359edf560fc4be86e92c0 (diff)
downloadchromium_src-f66333c798f7b252477fae4ef8827dc2cba7dbce.zip
chromium_src-f66333c798f7b252477fae4ef8827dc2cba7dbce.tar.gz
chromium_src-f66333c798f7b252477fae4ef8827dc2cba7dbce.tar.bz2
Move candidate_window.cc/gyp to input_method directory.
BUG=chromium-os:4063 TEST=make -j8 BUILDTYPE=Release candidate_window Review URL: http://codereview.chromium.org/2818017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50335 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp4
-rw-r--r--chrome/browser/chromeos/input_method/candidate_window.cc (renamed from chrome/browser/chromeos/text_input/candidate_window.cc)0
-rw-r--r--chrome/browser/chromeos/input_method/candidate_window.gyp (renamed from chrome/browser/chromeos/text_input/text_input.gyp)0
3 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 8473820..b19a518 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -122,7 +122,7 @@
}],
['chromeos==1', {
'dependencies': [
- '../chrome/browser/chromeos/text_input/text_input.gyp:*',
+ '../chrome/browser/chromeos/input_method/candidate_window.gyp:*',
],
}],
['remoting==1', {
@@ -328,7 +328,7 @@
'../remoting/remoting.gyp:remoting_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
- '../chrome/browser/chromeos/text_input/text_input.gyp:candidate_window',
+ '../chrome/browser/chromeos/input_method/candidate_window.gyp:candidate_window',
],
},
], # targets
diff --git a/chrome/browser/chromeos/text_input/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index 17a2b7f..17a2b7f 100644
--- a/chrome/browser/chromeos/text_input/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
diff --git a/chrome/browser/chromeos/text_input/text_input.gyp b/chrome/browser/chromeos/input_method/candidate_window.gyp
index cecd9d7..cecd9d7 100644
--- a/chrome/browser/chromeos/text_input/text_input.gyp
+++ b/chrome/browser/chromeos/input_method/candidate_window.gyp