chrome/browser/chromeos/login/screen_locker_browsertest.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_browsertest.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_locker.cc ('k') | chrome/browser/chromeos/login/touch_login_view.cc » ('j') | chrome/common/chrome_notification_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- chrome/browser/chromeos/login/screen_locker_browsertest.cc (revision 91771)

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

@@ -33,7 +33,7 @@

: browser_(browser),

running_(false) {

registrar_.Add(this,

- NotificationType::SCREEN_LOCK_STATE_CHANGED,

+ chrome::SCREEN_LOCK_STATE_CHANGED,

NotificationService::AllSources());

handler_id_ = g_signal_connect(

G_OBJECT(browser_->window()->GetNativeHandle()),

@@ -51,7 +51,7 @@

virtual void Observe(NotificationType type,

const NotificationSource& source,

const NotificationDetails& details) {

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

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

if (running_)

MessageLoop::current()->Quit();

}

@@ -117,7 +117,7 @@

tester->EmulateWindowManagerReady();

if (!chromeos::ScreenLocker::GetTester()->IsLocked())

ui_test_utils::WaitForNotification(

- NotificationType::SCREEN_LOCK_STATE_CHANGED);

+ chrome::SCREEN_LOCK_STATE_CHANGED);

EXPECT_TRUE(tester->IsLocked());

tester->InjectMockAuthenticator("", "");

@@ -139,7 +139,7 @@

tester->EmulateWindowManagerReady();

if (!tester->IsLocked()) {

ui_test_utils::WaitForNotification(

- NotificationType::SCREEN_LOCK_STATE_CHANGED);

+ chrome::SCREEN_LOCK_STATE_CHANGED);

}

EXPECT_TRUE(tester->IsLocked());

}

@@ -184,7 +184,7 @@

tester->EmulateWindowManagerReady();

if (!chromeos::ScreenLocker::GetTester()->IsLocked())

ui_test_utils::WaitForNotification(

- NotificationType::SCREEN_LOCK_STATE_CHANGED);

+ chrome::SCREEN_LOCK_STATE_CHANGED);

// Test to make sure that the widget is actually appearing and is of

// reasonable size, preventing a regression of