chrome/browser/chromeos/notifications/notification_browsertest.cc - Issue 3149026: Fix build due to conflict

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: chrome/browser/chromeos/notifications/notification_browsertest.cc

Issue 3149026: Fix build due to conflict (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 months 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: chrome/browser/chromeos/notifications/notification_browsertest.cc

diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc

index 6985bbd1ebf7b0871ca4fd3b62d3378e1786eef8..0dac6c6e017b06627174f36d5d4218500cc12e14 100644

--- a/chrome/browser/chromeos/notifications/notification_browsertest.cc

+++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc

@@ -54,7 +54,7 @@ class NotificationTest : public InProcessBrowserTest,

expected_(PanelController::INITIAL) {

}

- void HandleDOMUIMessage(const Value* value) {

+ void HandleDOMUIMessage(const ListValue* value) {

MessageLoop::current()->Quit();

}

« no previous file with comments | « chrome/browser/chromeos/notifications/balloon_view_host.cc ('k') | no next file » | no next file with comments »