chrome/browser/notifications/notification_exceptions_table_model.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_exceptions_table_model.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.h ('k') | chrome/browser/notifications/notification_ui_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/notification_exceptions_table_model.cc

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

--- chrome/browser/notifications/notification_exceptions_table_model.cc (revision 91968)

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

@@ -5,12 +5,12 @@

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

#include "base/auto_reset.h"

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

#include "chrome/common/content_settings.h"

#include "chrome/common/content_settings_helper.h"

#include "chrome/common/content_settings_types.h"

#include "chrome/common/url_constants.h"

#include "content/common/notification_service.h"

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

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/table_model_observer.h"

@@ -28,7 +28,8 @@

: service_(service),

updates_disabled_(false),

observer_(NULL) {

- registrar_.Add(this, NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED,

+ registrar_.Add(this,

+ chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED,

NotificationService::AllSources());

LoadEntries();

}

@@ -98,11 +99,11 @@

}

void NotificationExceptionsTableModel::Observe(

- NotificationType type,

+ int type,

const NotificationSource& source,

const NotificationDetails& details) {

if (!updates_disabled_) {

- DCHECK(type == NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED);

+ DCHECK(type == chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED);

entries_.clear();

LoadEntries();