chrome/browser/chromeos/notifications/notification_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/notifications/notification_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/notifications/balloon_view.cc ('k') | chrome/browser/chromeos/notifications/notification_panel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/notifications/notification_browsertest.cc

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

--- chrome/browser/chromeos/notifications/notification_browsertest.cc (revision 91971)

+++ chrome/browser/chromeos/notifications/notification_browsertest.cc (working copy)

@@ -17,6 +17,7 @@

#include "chrome/browser/notifications/notification_test_util.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

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

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

#include "chrome/test/in_process_browser_test.h"

#include "chrome/test/ui_test_utils.h"

#include "content/common/notification_service.h"

@@ -110,10 +111,10 @@

}

// NotificationObserver overrides.

- virtual void Observe(NotificationType type,

+ virtual void Observe(int type,

const NotificationSource& source,

const NotificationDetails& details) {

- ASSERT_TRUE(NotificationType::PANEL_STATE_CHANGED == type);

+ ASSERT_TRUE(chrome::NOTIFICATION_PANEL_STATE_CHANGED == type);

PanelController::State* state =

reinterpret_cast<PanelController::State*>(details.map_key());

state_ = *state;

@@ -301,7 +302,7 @@

// Register observer here as the registration does not work in SetUp().

NotificationRegistrar registrar;

registrar.Add(this,

- NotificationType::PANEL_STATE_CHANGED,

+ chrome::NOTIFICATION_PANEL_STATE_CHANGED,

NotificationService::AllSources());

BalloonCollectionImpl* collection = GetBalloonCollectionImpl();

@@ -368,7 +369,7 @@