summaryrefslogtreecommitdiffstats
path: root/chrome/browser/user_style_sheet_watcher.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-10 15:52:27 +0000
commit43211582b1fa8c69136385250e7b0446cf364b5c (patch)
tree655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/user_style_sheet_watcher.cc
parentd43970a7ceee5fc5433787b0f28b64234a4039f2 (diff)
downloadchromium_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/user_style_sheet_watcher.cc')
-rw-r--r--chrome/browser/user_style_sheet_watcher.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/user_style_sheet_watcher.cc b/chrome/browser/user_style_sheet_watcher.cc
index 25dc57b..86e08fd 100644
--- a/chrome/browser/user_style_sheet_watcher.cc
+++ b/chrome/browser/user_style_sheet_watcher.cc
@@ -6,8 +6,9 @@
#include "base/base64.h"
#include "base/file_util.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/common/content_notification_types.h"
#include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
using ::base::files::FilePathWatcher;
@@ -77,7 +78,7 @@ UserStyleSheetLoader::UserStyleSheetLoader()
void UserStyleSheetLoader::NotifyLoaded() {
if (has_loaded_) {
NotificationService::current()->Notify(
- NotificationType::USER_STYLE_SHEET_UPDATED,
+ chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED,
Source<UserStyleSheetLoader>(this),
NotificationService::NoDetails());
}
@@ -131,7 +132,7 @@ UserStyleSheetWatcher::UserStyleSheetWatcher(const FilePath& profile_path)
// Listen for when the first render view host is created. If we load
// too fast, the first tab won't hear the notification and won't get
// the user style sheet.
- registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+ registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
NotificationService::AllSources());
}
@@ -163,9 +164,9 @@ GURL UserStyleSheetWatcher::user_style_sheet() const {
return loader_->user_style_sheet();
}
-void UserStyleSheetWatcher::Observe(NotificationType type,
+void UserStyleSheetWatcher::Observe(int type,
const NotificationSource& source, const NotificationDetails& details) {
- DCHECK(type == NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB);
+ DCHECK(type == content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB);
loader_->NotifyLoaded();
registrar_.RemoveAll();
}