ui/chromeos/ime/candidate_window_view.cc - 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

Unified Diff: ui/chromeos/ime/candidate_window_view.cc

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

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/chromeos/ime/candidate_window_view.cc

diff --git a/ui/chromeos/ime/candidate_window_view.cc b/ui/chromeos/ime/candidate_window_view.cc

index 93755219f3f3da76ab4033c5dec94c2010594ffb..994a1a8878473cc9d878263c71012606f4604fc0 100644

--- a/ui/chromeos/ime/candidate_window_view.cc

+++ b/ui/chromeos/ime/candidate_window_view.cc

@@ -159,7 +159,7 @@ CandidateWindowView::CandidateWindowView(gfx::NativeView parent)

SetBorder(views::Border::CreateSolidBorder(

- GetNativeTheme()->theme->GetSystemColor(

+ GetNativeTheme()->GetSystemColor(

ui::NativeTheme::kColorId_MenuBorderColor)));

SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));

« no previous file with comments | « no previous file | no next file » | no next file with comments »