diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
commit | 43211582b1fa8c69136385250e7b0446cf364b5c (patch) | |
tree | 655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/notifications/notification_exceptions_table_model.cc | |
parent | d43970a7ceee5fc5433787b0f28b64234a4039f2 (diff) | |
download | chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.zip chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.gz chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.bz2 |
Moving notification types which are chrome specific to a new header file chrome_notification_types.h.
This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h
BUG=76698
Review URL: http://codereview.chromium.org/7327007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification_exceptions_table_model.cc')
-rw-r--r-- | chrome/browser/notifications/notification_exceptions_table_model.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc index cb4db02..e4fd3ed 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model.cc @@ -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 @@ NotificationExceptionsTableModel::NotificationExceptionsTableModel( : 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::SetObserver( } 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(); |