summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/notifications/notification_browsertest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
commit6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch)
treea75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/chromeos/notifications/notification_browsertest.cc
parentbf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff)
downloadchromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/notifications/notification_browsertest.cc')
-rw-r--r--chrome/browser/chromeos/notifications/notification_browsertest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc
index 49d2895..dbe881a 100644
--- a/chrome/browser/chromeos/notifications/notification_browsertest.cc
+++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc
@@ -33,7 +33,7 @@ const char* kChromeOsWindowManagerName = "chromeos-wm";
namespace chromeos {
class NotificationTest : public InProcessBrowserTest,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
NotificationTest()
: under_chromeos_(false),
@@ -112,8 +112,8 @@ class NotificationTest : public InProcessBrowserTest,
// NotificationObserver overrides.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
ASSERT_TRUE(chrome::NOTIFICATION_PANEL_STATE_CHANGED == type);
PanelController::State* state =
reinterpret_cast<PanelController::State*>(details.map_key());
@@ -301,7 +301,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition1) {
// 0. This test explicitly controls the stale state instead.
IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition2) {
// Register observer here as the registration does not work in SetUp().
- NotificationRegistrar registrar;
+ content::NotificationRegistrar registrar;
registrar.Add(this,
chrome::NOTIFICATION_PANEL_STATE_CHANGED,
NotificationService::AllSources());
@@ -368,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, TestStateTransition2) {
}
IN_PROC_BROWSER_TEST_F(NotificationTest, TestCleanupOnExit) {
- NotificationRegistrar registrar;
+ content::NotificationRegistrar registrar;
registrar.Add(this,
chrome::NOTIFICATION_PANEL_STATE_CHANGED,
NotificationService::AllSources());