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/plugin_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/plugin_exceptions_table_model.cc')
| -rw-r--r-- | chrome/browser/plugin_exceptions_table_model.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index 1cf2a69..2a1ff0e 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -7,6 +7,7 @@ #include "base/auto_reset.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" +#include "chrome/common/chrome_notification_types.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -19,10 +20,10 @@ PluginExceptionsTableModel::PluginExceptionsTableModel( otr_map_(otr_content_settings_map), updates_disabled_(false), observer_(NULL) { - registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED, + registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED, Source<HostContentSettingsMap>(map_)); if (otr_map_) { - registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED, + registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED, Source<HostContentSettingsMap>(otr_map_)); } } @@ -122,7 +123,7 @@ int PluginExceptionsTableModel::GetGroupID(int row) { return settings_[row].plugin_id; } -void PluginExceptionsTableModel::Observe(NotificationType type, +void PluginExceptionsTableModel::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { if (!updates_disabled_) |