chrome/browser/notifications/notification_ui_manager.cc - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

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/notifications/notification_ui_manager.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 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

« no previous file with comments | « chrome/browser/notifications/notification_exceptions_table_model.cc ('k') | chrome/browser/omnibox_search_hint.cc » ('j') | chrome/common/chrome_notification_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_ui_manager.cc

===================================================================

--- chrome/browser/notifications/notification_ui_manager.cc (revision 91771)

+++ chrome/browser/notifications/notification_ui_manager.cc (working copy)

@@ -13,10 +13,10 @@

#include "chrome/browser/notifications/balloon_collection.h"

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

#include "chrome/browser/prefs/pref_service.h"

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "content/browser/site_instance.h"

#include "content/common/notification_service.h"

-#include "content/common/notification_type.h"

namespace {

const int kUserStatePollingIntervalSeconds = 1;

@@ -237,7 +237,7 @@

const NotificationDetails& details) {

if (type == NotificationType::APP_TERMINATING) {

CancelAll();

- } else if (type == NotificationType::PREF_CHANGED) {

+ } else if (type == chrome::PREF_CHANGED) {

std::string* name = Details<std::string>(details).ptr();

if (*name == prefs::kDesktopNotificationPosition)

balloon_collection_->SetPositionPreference(