diff options
author | meelapshah@chromium.org <meelapshah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 17:30:49 +0000 |
---|---|---|
committer | meelapshah@chromium.org <meelapshah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 17:30:49 +0000 |
commit | 72d0fc7358e46f8646ebb14e3ea882618c260039 (patch) | |
tree | fdce419abfd8903d8d002bb74185f7ac36dbd262 /chrome/browser/dom_ui | |
parent | 47c2188f2fc336b6040d6047afca32eb8e9779d8 (diff) | |
download | chromium_src-72d0fc7358e46f8646ebb14e3ea882618c260039.zip chromium_src-72d0fc7358e46f8646ebb14e3ea882618c260039.tar.gz chromium_src-72d0fc7358e46f8646ebb14e3ea882618c260039.tar.bz2 |
Change ThumbnailStore to use sqlite instead of individual files try 2. Previous try failed interactive_ui_tests.
Review URL: http://codereview.chromium.org/149361
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r-- | chrome/browser/dom_ui/dom_ui_thumbnail_source.cc | 4 | ||||
-rw-r--r-- | chrome/browser/dom_ui/dom_ui_thumbnail_source.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc index fd40e867..5a10c7c 100644 --- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc +++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc @@ -17,14 +17,14 @@ DOMUIThumbnailSource::DOMUIThumbnailSource(Profile* profile) : DataSource(chrome::kChromeUIThumbnailPath, MessageLoop::current()), - profile_(profile), - store_(profile->GetThumbnailStore()) { + profile_(profile) { } void DOMUIThumbnailSource::StartDataRequest(const std::string& path, int request_id) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kThumbnailStore)) { RefCountedBytes* data = NULL; + scoped_refptr<ThumbnailStore> store_ = profile_->GetThumbnailStore(); if (store_->GetPageThumbnail(GURL(path), &data)) { // Got the thumbnail. diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h index 2d475af..c94967b 100644 --- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h +++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h @@ -40,9 +40,6 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource { Profile* profile_; CancelableRequestConsumerT<int, 0> cancelable_consumer_; - // The ThumbnailStore from which thumbnails are requested. - scoped_refptr<ThumbnailStore> store_; - // Raw PNG representation of the thumbnail to show when the thumbnail // database doesn't have a thumbnail for a webpage. scoped_refptr<RefCountedBytes> default_thumbnail_; |