diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 05:32:23 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 05:32:23 +0000 |
commit | 10c2d69eef670a8870a53c5a0afee74810d416d6 (patch) | |
tree | c7b102852b40953ebb1da5ecce5f2a9cab0eccdb /chrome/browser/importer | |
parent | 8623b0f992684cf2bca8fc27f733ad1c31cdd8f8 (diff) | |
download | chromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.zip chromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.tar.gz chromium_src-10c2d69eef670a8870a53c5a0afee74810d416d6.tar.bz2 |
Move URLFetcherDelegate to net/ and split URLFetcher between net/ and content/
Temporarily make a shim content::URLFetcherDelegate class. A future CL
will replace all instances of content::URLFetcherDelegate with
net::URLFetcherDelegate and remove that class.
Move most URLFetcher methods to net::URLFetcher, except for the static
methods (which will be handled in a future CL) and AssociateWithRenderView,
which is content-specific.
Replace all instances of content::URLFetcher* in the URLFetcherDelegate
callbacks with net::URLFetcher* (except for rlz, which required its own special hack).
BUG=118220
TEST=
TBR=mnissler@chromium.org,jhawkins@chromium.org,cpu@chromium.org,estade@chromium.org,sky@chromium.org,joth@chromium.org,satish@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10386063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r-- | chrome/browser/importer/toolbar_importer.cc | 2 | ||||
-rw-r--r-- | chrome/browser/importer/toolbar_importer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index e62755e..f3d9673 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -102,7 +102,7 @@ void Toolbar5Importer::Cancel() { } } -void Toolbar5Importer::OnURLFetchComplete(const content::URLFetcher* source) { +void Toolbar5Importer::OnURLFetchComplete(const net::URLFetcher* source) { if (cancelled()) { EndImport(); return; diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h index 2e8ddb1..6ca3a0c 100644 --- a/chrome/browser/importer/toolbar_importer.h +++ b/chrome/browser/importer/toolbar_importer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -49,7 +49,7 @@ class Toolbar5Importer : public content::URLFetcherDelegate, public Importer { virtual void Cancel() OVERRIDE; // content::URLFetcherDelegate method called back from the URLFetcher object. - virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE; + virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; private: FRIEND_TEST_ALL_PREFIXES(Toolbar5ImporterTest, BookmarkParse); |