summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-01 18:16:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-01 18:16:56 +0000
commitbfd04a62ce610d7bb61dbb78811dccbed23589b7 (patch)
tree70bb228c0f00ba1c12c584efd569daccf96b4026 /chrome/browser/profile.h
parenta814d863440f0a154a7299f2d8b440f405c7700e (diff)
downloadchromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.zip
chromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.tar.gz
chromium_src-bfd04a62ce610d7bb61dbb78811dccbed23589b7.tar.bz2
Remove most header file dependencies on the notification type list. It is
really painful to add more types, since lots of headers include the notification service to derive from the notification observer. This splits that out, so much less of the project should end up including notification_types.h ---Paths modified but not in any changelist: Review URL: http://codereview.chromium.org/19744 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.h')
-rw-r--r--chrome/browser/profile.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index 7189577..ef2f713 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -4,8 +4,8 @@
// This class gathers state related to a single user profile.
-#ifndef CHROME_BROWSER_PROFILE_H__
-#define CHROME_BROWSER_PROFILE_H__
+#ifndef CHROME_BROWSER_PROFILE_H_
+#define CHROME_BROWSER_PROFILE_H_
#include <set>
#include <string>
@@ -19,7 +19,7 @@
#ifdef CHROME_PERSONALIZATION
#include "chrome/personalization/personalization.h"
#endif
-#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_observer.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
@@ -366,7 +366,7 @@ class ProfileImpl : public Profile,
// GetSessionService won't recreate the SessionService.
bool shutdown_session_service_;
- DISALLOW_EVIL_CONSTRUCTORS(ProfileImpl);
+ DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
};
// This struct is used to pass the spellchecker object through the notification
@@ -376,5 +376,4 @@ struct SpellcheckerReinitializedDetails {
scoped_refptr<SpellChecker> spellchecker;
};
-#endif // CHROME_BROWSER_PROFILE_H__
-
+#endif // CHROME_BROWSER_PROFILE_H_