From 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 19 Oct 2011 02:52:53 +0000 Subject: 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 --- chrome/common/native_window_notification_source.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'chrome/common') diff --git a/chrome/common/native_window_notification_source.h b/chrome/common/native_window_notification_source.h index 72901d9..be5cd81 100644 --- a/chrome/common/native_window_notification_source.h +++ b/chrome/common/native_window_notification_source.h @@ -6,20 +6,22 @@ #define CHROME_COMMON_NATIVE_WINDOW_NOTIFICATION_SOURCE_H_ #pragma once -#include "content/common/notification_source.h" +#include "content/public/browser/notification_source.h" #include "ui/gfx/native_widget_types.h" +namespace content { + // Specialization of the Source class for native windows. On Windows, these are // HWNDs rather than pointers, and since the Source class expects a pointer // type, this is necessary. On Mac/Linux, these are pointers, so this is // unnecessary but harmless. template<> -class Source : public NotificationSource { +class Source : public content::NotificationSource { public: - explicit Source(gfx::NativeWindow wnd) : NotificationSource(wnd) {} + explicit Source(gfx::NativeWindow wnd) : content::NotificationSource(wnd) {} - explicit Source(const NotificationSource& other) - : NotificationSource(other) {} + explicit Source(const content::NotificationSource& other) + : content::NotificationSource(other) {} gfx::NativeWindow operator->() const { return ptr(); } gfx::NativeWindow ptr() const { @@ -27,4 +29,6 @@ class Source : public NotificationSource { } }; +} + #endif // CHROME_COMMON_NATIVE_WINDOW_NOTIFICATION_SOURCE_H_ -- cgit v1.1