trunk/src/chrome/browser/notifications/notification.cc - Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER"

Side by Side Diff

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

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

Side by Side Diff: trunk/src/chrome/browser/notifications/notification.cc

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/browser/notifications/message_center_notifications_browsertest.cc ('k') | trunk/src/chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/notifications/notification.h"	5 #include "chrome/browser/notifications/notification.h"

6	6

7 #include "chrome/browser/notifications/desktop_notification_service.h"	7 #include "chrome/browser/notifications/desktop_notification_service.h"

8	8

9 Notification::Notification(const GURL& origin_url,	9 Notification::Notification(const GURL& origin_url,

10 const GURL& content_url,	10 const GURL& content_url,

(...skipping 109 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
120 replace_id_ = notification.replace_id();	120 replace_id_ = notification.replace_id();

121 if (notification.optional_fields())	121 if (notification.optional_fields())

122 optional_fields_.reset(notification.optional_fields()->DeepCopy());	122 optional_fields_.reset(notification.optional_fields()->DeepCopy());

123 else	123 else

124 optional_fields_.reset();	124 optional_fields_.reset();

125 delegate_ = notification.delegate();	125 delegate_ = notification.delegate();

126 return *this;	126 return *this;

127 }	127 }

128	128

129 void Notification::DisableTimeout() {	129 void Notification::DisableTimeout() {

	130 #if defined(ENABLE_MESSAGE_CENTER)

130 if (!optional_fields_.get())	131 if (!optional_fields_.get())

131 optional_fields_.reset(new base::DictionaryValue());	132 optional_fields_.reset(new base::DictionaryValue());

132 optional_fields_->SetBoolean(message_center::kPrivateNeverTimeoutKey, true);	133 optional_fields_->SetBoolean(message_center::kPrivateNeverTimeoutKey, true);

	134 #endif

133 }	135 }

OLD	NEW