summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_setup_wizard.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 08:32:17 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 08:32:17 +0000
commit8de85a60ef3c615360d0c644f7f16f9a13103865 (patch)
tree0ac8ff6a33b4b70c868015fb50b16c08f92d5018 /chrome/browser/sync/sync_setup_wizard.cc
parent716984c61da9f5a8ac8158d122e50646081f5b6e (diff)
downloadchromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.zip
chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.gz
chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.bz2
Revert "Revert r31175 r31176 r31187"
The bustage seems to be a WebKit change upstream. It is not reverted in WebKit and merger. So bring the innocent change back in. TBR=jam TEST=green tree Review URL: http://codereview.chromium.org/375009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_wizard.cc')
-rw-r--r--chrome/browser/sync/sync_setup_wizard.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 645c931..b05fe30 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -23,7 +23,6 @@ class SyncResourcesSource : public ChromeURLDataManager::DataSource {
SyncResourcesSource()
: DataSource(chrome::kSyncResourcesHost, MessageLoop::current()) {
}
- virtual ~SyncResourcesSource() { }
virtual void StartDataRequest(const std::string& path, int request_id);
@@ -33,7 +32,10 @@ class SyncResourcesSource : public ChromeURLDataManager::DataSource {
else
return "text/html";
}
+
private:
+ virtual ~SyncResourcesSource() {}
+
DISALLOW_COPY_AND_ASSIGN(SyncResourcesSource);
};