chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc - Issue 7053041: Add a Create method to DesktopNotificationHandler and stubs for the notification objects.

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/printing/cloud_print/cloud_print_proxy_service.cc

Issue 7053041: Add a Create method to DesktopNotificationHandler and stubs for the notification objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Try to fix trybot failures and address torne's comments. Created 9 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/notifications/desktop_notification_service.h ('K') | « chrome/browser/notifications/notification_ui_manager.h ('k') | chrome/browser/task_manager/task_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

index 86dc073bf11da908c9752d238e45457acc6c4031..d7ec5c5e81d64601b5a6466c1d9e0f2906836841 100644

--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

@@ -111,12 +111,9 @@ bool CloudPrintProxyService::ShowTokenExpiredNotification() {

string16 title = UTF8ToUTF16(kCloudPrintProductName);

string16 message =

l10n_util::GetStringUTF16(IDS_CLOUD_PRINT_TOKEN_EXPIRED_MESSAGE);

- string16 content_url = DesktopNotificationService::CreateDataUrl(

- icon_url, title, message, WebKit::WebTextDirectionDefault);

- token_expired_delegate_ = new TokenExpiredNotificationDelegate(this);

- Notification notification(GURL(), GURL(content_url), string16(), string16(),

- token_expired_delegate_.get());

- g_browser_process->notification_ui_manager()->Add(notification, profile_);

+ DesktopNotificationService::ShowBalloon(

+ GURL(), icon_url, title, message, token_expired_delegate_.get(),

+ profile_);

// Keep the browser alive while we are showing the notification.

BrowserList::StartKeepAlive();

return true;