chrome/browser/chromeos/login/base_login_display_host.cc - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/base_login_display_host.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/base_login_display_host.h ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/base_login_display_host.cc

===================================================================

--- chrome/browser/chromeos/login/base_login_display_host.cc (revision 91971)

+++ chrome/browser/chromeos/login/base_login_display_host.cc (working copy)

@@ -28,8 +28,8 @@

#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/common/pref_names.h"

+#include "content/common/content_notification_types.h"

#include "content/common/notification_service.h"

-#include "content/common/notification_type.h"

#include "googleurl/src/gurl.h"

#include "third_party/cros/chromeos_wm_ipc_enums.h"

#include "ui/base/resource/resource_bundle.h"

@@ -97,7 +97,7 @@

// will block the shutdown.

registrar_.Add(

this,

- NotificationType::APP_EXITING,

+ content::NOTIFICATION_APP_EXITING,

NotificationService::AllSources());

DCHECK(default_host_ == NULL);

default_host_ = this;

@@ -194,10 +194,10 @@

// BaseLoginDisplayHost --------------------------------------------------------

-void BaseLoginDisplayHost::Observe(NotificationType type,

+void BaseLoginDisplayHost::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- CHECK(type == NotificationType::APP_EXITING);

+ CHECK(type == content::NOTIFICATION_APP_EXITING);

registrar_.RemoveAll();

MessageLoop::current()->DeleteSoon(FROM_HERE, this);