diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 22:58:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 22:58:17 +0000 |
| commit | 3770c24a1359d01dae7c48508fda5a55c342ee1e (patch) | |
| tree | 9ee9ae3397fa4225ebd061597378d5117791dfe1 /chrome/browser/page_cycler | |
| parent | be61f4b20100e2b4514b670c36ed69527664513b (diff) | |
| download | chromium_src-3770c24a1359d01dae7c48508fda5a55c342ee1e.zip chromium_src-3770c24a1359d01dae7c48508fda5a55c342ee1e.tar.gz chromium_src-3770c24a1359d01dae7c48508fda5a55c342ee1e.tar.bz2 | |
Move implementation of BrowserList onto an inner, instantiatable class, BrowserListImpl.
This is so we can create one BrowserListImpl per universe.
Eventually we'll get rid of BrowserList, but for now this change strives for compat.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10690151
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_cycler')
| -rw-r--r-- | chrome/browser/page_cycler/page_cycler.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/page_cycler/page_cycler.h | 9 | ||||
| -rw-r--r-- | chrome/browser/page_cycler/page_cycler_unittest.cc | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index dea717b..5647d6d 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -13,7 +13,9 @@ #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/chrome_process_util.h" diff --git a/chrome/browser/page_cycler/page_cycler.h b/chrome/browser/page_cycler/page_cycler.h index 7fd9e6f..7304be4 100644 --- a/chrome/browser/page_cycler/page_cycler.h +++ b/chrome/browser/page_cycler/page_cycler.h @@ -7,11 +7,12 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_list_observer.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents_observer.h" +class Browser; + namespace content { class RenderViewHost; } // namespace content @@ -25,7 +26,7 @@ class TimeTicks; // does most of its work there. However, some work happens on background threads // too; those are named with 'OnBackgroundThread'. class PageCycler : public base::RefCountedThreadSafe<PageCycler>, - public BrowserList::Observer, + public chrome::BrowserListObserver, public content::WebContentsObserver { public: PageCycler(Browser* browser, const FilePath& urls_file); @@ -101,7 +102,7 @@ class PageCycler : public base::RefCountedThreadSafe<PageCycler>, // PageCycler. void Abort(); - // BrowserList::Observer + // chrome::BrowserListObserver virtual void OnBrowserAdded(Browser* browser) OVERRIDE; virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc index 6b6e408..df99e39 100644 --- a/chrome/browser/page_cycler/page_cycler_unittest.cc +++ b/chrome/browser/page_cycler/page_cycler_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/page_cycler/page_cycler.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" |