diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
| commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
| tree | a75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/sessions/session_service.h | |
| parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
| download | chromium_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/sessions/session_service.h')
| -rw-r--r-- | chrome/browser/sessions/session_service.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h index 2d4ebd6..6c863b2 100644 --- a/chrome/browser/sessions/session_service.h +++ b/chrome/browser/sessions/session_service.h @@ -17,8 +17,8 @@ #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "ui/base/ui_base_types.h" class NavigationEntry; @@ -49,7 +49,7 @@ class TabContentsWrapper; // SessionService rebuilds the contents of the file from the open state // of the browser. class SessionService : public BaseSessionService, - public NotificationObserver { + public content::NotificationObserver { friend class SessionServiceTestHelper; public: // Creates a SessionService for the specified profile. @@ -207,8 +207,8 @@ class SessionService : public BaseSessionService, Browser* browser); virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Sets the application extension id of the specified tab. void SetTabExtensionAppID(const SessionID& window_id, @@ -404,7 +404,7 @@ class SessionService : public BaseSessionService, static WindowType WindowTypeForBrowserType(Browser::Type type); static Browser::Type BrowserTypeForWindowType(WindowType type); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; // Maps from session tab id to the range of navigation entries that has // been written to disk. |