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

Issue 1149223004: Avoid basename conflict in text_composition (Closed)

Created:
5 years, 7 months ago by scottmg
Modified:
5 years, 7 months ago
Reviewers:
Shu Chen, Nico
CC:
chromium-reviews, nona+watch_chromium.org, James Su, shuchen+watch_chromium.org, penghuang+watch_chromium.org, yusukes+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Avoid basename conflict in text_composition Rename ui/base/ime/chromeos/text_composition to ui/base/ime/chromeos/text_composition_chromeos, to avoid conflict in basename with ui/base/ime/text_composition. See http://code.google.com/p/gyp/issues/detail?id=384. Also, ui/base/ime/chromeos/composition_text_unittest.cc was not listed in any build file, so include the "_chromeos" in its name too, to match, and then add it to gyp/gn files. (I may regret that.) BUG=490824, gyp:384, 472772 Committed: https://crrev.com/9d8b18c008df8a627e9d215fe92d354e0d574f26 Cr-Commit-Position: refs/heads/master@{#331264}

Patch Set 1 #

Patch Set 2 : . #

Patch Set 3 : . #

Unified diffs Side-by-side diffs Delta from patch set Stats (+20 lines, -165 lines) Patch
M chrome/browser/chromeos/input_method/input_method_engine.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M ui/base/BUILD.gn View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M ui/base/ime/BUILD.gn View 1 2 chunks +5 lines, -6 lines 0 comments Download
D ui/base/ime/chromeos/composition_text.h View 1 1 chunk +0 lines, -70 lines 0 comments Download
D ui/base/ime/chromeos/composition_text.cc View 1 1 chunk +0 lines, -22 lines 0 comments Download
A + ui/base/ime/chromeos/composition_text_chromeos.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
A + ui/base/ime/chromeos/composition_text_chromeos.cc View 1 1 chunk +1 line, -1 line 0 comments Download
A + ui/base/ime/chromeos/composition_text_chromeos_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
D ui/base/ime/chromeos/composition_text_unittest.cc View 1 1 chunk +0 lines, -54 lines 0 comments Download
M ui/base/ime/chromeos/mock_ime_input_context_handler.h View 1 1 chunk +1 line, -1 line 0 comments Download
M ui/base/ime/chromeos/mock_ime_input_context_handler.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M ui/base/ime/input_method_chromeos.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M ui/base/ime/input_method_chromeos_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M ui/base/ime/ui_base_ime.gyp View 1 1 chunk +2 lines, -2 lines 0 comments Download
M ui/base/ui_base_tests.gyp View 1 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 24 (10 generated)
scottmg
5 years, 7 months ago (2015-05-22 22:17:18 UTC) #3
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149223004/20001
5 years, 7 months ago (2015-05-22 22:19:49 UTC) #5
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_gn_chromeos_rel/builds/40479)
5 years, 7 months ago (2015-05-22 22:32:09 UTC) #7
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149223004/40001
5 years, 7 months ago (2015-05-22 22:35:37 UTC) #9
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 7 months ago (2015-05-22 23:48:52 UTC) #11
Shu Chen
lgtm
5 years, 7 months ago (2015-05-24 06:48:59 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149223004/40001
5 years, 7 months ago (2015-05-25 02:09:24 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/65712)
5 years, 7 months ago (2015-05-25 02:15:34 UTC) #16
scottmg
+thakis for ui/base/BUILD.gn ui/base/ui_base_tests.gyp
5 years, 7 months ago (2015-05-25 02:17:31 UTC) #17
scottmg
+thakis for ui/base/BUILD.gn ui/base/ui_base_tests.gyp
5 years, 7 months ago (2015-05-25 02:17:43 UTC) #19
Nico
These two files lgtm
5 years, 7 months ago (2015-05-25 04:01:10 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1149223004/40001
5 years, 7 months ago (2015-05-25 05:02:15 UTC) #22
commit-bot: I haz the power
Committed patchset #3 (id:40001)
5 years, 7 months ago (2015-05-25 06:15:56 UTC) #23
commit-bot: I haz the power
5 years, 7 months ago (2015-05-25 06:17:00 UTC) #24
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/9d8b18c008df8a627e9d215fe92d354e0d574f26
Cr-Commit-Position: refs/heads/master@{#331264}

Powered by Google App Engine
This is Rietveld 408576698