Issue 2586013002: Fix bad merge conflict resolution from m55 merge of IME window fix.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 2586013002: Fix bad merge conflict resolution from m55 merge of IME window fix. (Closed)

Created:
4 years ago by Evan Stade

Modified:
4 years ago

Reviewers:

CC:
chromium-reviews, nona+watch_chromium.org, shuchen+watch_chromium.org, yusukes+watch_chromium.org, oshima+watch_chromium.org

Target Ref:
refs/pending/branch-heads/2883

Project:
chromium

Visibility:
Public.

Fix bad merge conflict resolution from m55 merge of IME window fix. BUG=664363

Created: 4 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -1 line)			Patch
	M	ui/chromeos/ime/candidate_window_view.cc	View		1 chunk	+1 line, -1 line	0 comments	Download

Total messages: 1 (0 generated)

Evan Stade

4 years ago (2016-12-17 06:10:13 UTC) #1

Message was sent while issue was closed.

Committed patchset #1 (id:1) to pending queue manually as
faee27f8967e296562e9bd473a83415e0e81f857.