chrome/browser/chromeos/login/screen_locker.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/screen_locker.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/screen_lock_view.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -41,6 +41,7 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "content/browser/browser_thread.h"

#include "content/browser/user_metrics.h"

@@ -74,15 +75,15 @@

public NotificationObserver {

public:

ScreenLockObserver() {

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

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

NotificationService::AllSources());

}

// NotificationObserver overrides:

- virtual void Observe(NotificationType type,

+ virtual void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) OVERRIDE {

- if (type == NotificationType::LOGIN_USER_CHANGED) {

+ if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {

// Register Screen Lock after login screen to make sure

// we don't show the screen lock on top of the login screen by accident.

if (chromeos::CrosLibrary::Get()->EnsureLoaded())

@@ -1112,7 +1113,7 @@

screen_locker_ = NULL;

bool state = false;

NotificationService::current()->Notify(

- NotificationType::SCREEN_LOCK_STATE_CHANGED,

+ chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,

Source<ScreenLocker>(this),

Details<bool>(&state));

if (CrosLibrary::Get()->EnsureLoaded())

@@ -1143,7 +1144,7 @@

bool state = true;