Issue 3149026: Fix build due to conflict

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 3149026: Fix build due to conflict (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
4 years, 9 months ago by oshima

Modified:
3 years, 11 months ago

Reviewers:
brettw, Evan Stade, Paweł Hajdan Jr.

CC:
chromium-reviews, Paweł Hajdan Jr., davemoore+watch_chromium.org, ben+cc_chromium.org

Base URL:
http://src.chromium.org/git/chromium.git

Visibility:
Public.

Created: 4 years, 9 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+10 lines, -20 lines)			Patch
M	chrome/browser/chromeos/notifications/balloon_view_host.h	View	2 chunks	+2 lines, -7 lines	0 comments	Download
M	chrome/browser/chromeos/notifications/balloon_view_host.cc	View	2 chunks	+7 lines, -12 lines	0 comments	Download
M	chrome/browser/chromeos/notifications/notification_browsertest.cc	View	1 chunk	+1 line, -1 line	0 comments	Download

Trybot results:

Total messages: 4 (0 generated)

Paweł Hajdan Jr.

Rubber-stamp LGTM. I'd let Brett and Evan take another look, because I don't really know ...

4 years, 9 months ago (2010-08-19 22:04:08 UTC) #2

Evan Stade

4 years, 9 months ago (2010-08-19 22:52:00 UTC) #4

lgtm

-- Evan Stade



On Thu, Aug 19, 2010 at 3:07 PM,  <brettw@chromium.org> wrote:
> LGTM
>
> http://codereview.chromium.org/3149026/show
>