diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 08:20:53 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 08:20:53 +0000 |
| commit | 3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9 (patch) | |
| tree | 062a1879d04c5f3a19b84c0502cecb532df198b1 /chrome/service/service_process.cc | |
| parent | 6b04841b5231edf19914543504cf52f39b1baca7 (diff) | |
| download | chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.zip chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.tar.gz chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.tar.bz2 | |
Move content::URLFetcher static functions to net::URLFetcher
Remove content::URLFetcher.
Update all references.
Add explicit dependency on content_common from browser, since template_url_fetcher.cc calls AssociateURLFetcherWithRenderView
(there are probably other direct uses of content_common).
BUG=118220
TEST=
TBR=satorux@chromium.org,mnissler@chromium.org,mal@chromium.org,jhawkins@chromium.org,sky@chromium.org,rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10554008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/service_process.cc')
| -rw-r--r-- | chrome/service/service_process.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 7b77781..d585f30 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -26,17 +26,17 @@ #include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_ipc_server.h" #include "chrome/service/service_process_prefs.h" -#include "content/public/common/url_fetcher.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/network_change_notifier.h" +#include "net/url_request/url_fetcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" #if defined(TOOLKIT_GTK) -#include "ui/gfx/gtk_util.h" #include <gtk/gtk.h> +#include "ui/gfx/gtk_util.h" #endif ServiceProcess* g_service_process = NULL; @@ -71,7 +71,7 @@ ServiceIOThread::~ServiceIOThread() { } void ServiceIOThread::CleanUp() { - content::URLFetcher::CancelAll(); + net::URLFetcher::CancelAll(); } // Prepares the localized strings that are going to be displayed to |