summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy/browser_policy_connector.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/policy/browser_policy_connector.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/policy/browser_policy_connector.cc')
-rw-r--r--chrome/browser/policy/browser_policy_connector.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index baf2d03..a672e7a 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/policy/dummy_configuration_policy_provider.h"
#include "chrome/browser/policy/user_policy_cache.h"
#include "chrome/browser/policy/user_policy_token_cache.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/net/gaia/gaia_constants.h"
@@ -246,7 +247,7 @@ void BrowserPolicyConnector::InitializeUserPolicy(const std::string& user_name,
if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
token_service_ = token_service;
registrar_.Add(this,
- NotificationType::TOKEN_AVAILABLE,
+ chrome::NOTIFICATION_TOKEN_AVAILABLE,
Source<TokenService>(token_service_));
FilePath policy_cache_dir = policy_dir.Append(kPolicyDir);
@@ -336,11 +337,11 @@ void BrowserPolicyConnector::InitializeDevicePolicySubsystem() {
#endif
}
-void BrowserPolicyConnector::Observe(NotificationType type,
+void BrowserPolicyConnector::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (type == NotificationType::TOKEN_AVAILABLE) {
+ if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
const TokenService* token_source =
Source<const TokenService>(source).ptr();
DCHECK_EQ(token_service_, token_source);