chrome/browser/automation/automation_provider_observers_chromeos.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/automation/automation_provider_observers_chromeos.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/automation/automation_provider_observers.cc ('k') | chrome/browser/automation/automation_resource_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/automation_provider_observers_chromeos.cc

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

--- chrome/browser/automation/automation_provider_observers_chromeos.cc (revision 91968)

+++ chrome/browser/automation/automation_provider_observers_chromeos.cc (working copy)

@@ -49,7 +49,7 @@

automation_(automation->AsWeakPtr()),

reply_message_(reply_message) {

controller_->set_login_status_consumer(this);

- registrar_.Add(this, NotificationType::LOAD_STOP,

+ registrar_.Add(this, chrome::LOAD_STOP,

NotificationService::AllSources());

}

@@ -73,7 +73,7 @@

controller_->set_login_status_consumer(NULL);

}

-void LoginObserver::Observe(NotificationType type,

+void LoginObserver::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

AutomationJSONReply(automation_, reply_message_.release()).SendSuccess(NULL);

@@ -87,16 +87,16 @@

: automation_(automation->AsWeakPtr()),

reply_message_(reply_message),

lock_screen_(lock_screen) {

- registrar_.Add(this, NotificationType::SCREEN_LOCK_STATE_CHANGED,

+ registrar_.Add(this, chrome::SCREEN_LOCK_STATE_CHANGED,

NotificationService::AllSources());

}

ScreenLockUnlockObserver::~ScreenLockUnlockObserver() {}

-void ScreenLockUnlockObserver::Observe(NotificationType type,

+void ScreenLockUnlockObserver::Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- DCHECK(type == NotificationType::SCREEN_LOCK_STATE_CHANGED);

+ DCHECK(type == chrome::SCREEN_LOCK_STATE_CHANGED);

if (automation_) {

AutomationJSONReply reply(automation_, reply_message_.release());

bool is_screen_locked = *Details<bool>(details).ptr();