diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-24 06:21:53 +0000 |
| commit | 978df34538607d50bf4690f2d679c1bef860398c (patch) | |
| tree | b99abc0b44316c0bfa16374746996ac209e363a6 /chrome/browser/gears_integration.cc | |
| parent | 391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff) | |
| download | chromium_src-978df34538607d50bf4690f2d679c1bef860398c.zip chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.gz chromium_src-978df34538607d50bf4690f2d679c1bef860398c.tar.bz2 | |
Move base64 from 'net/base' into 'base'.
BUG=13572
TEST=none
Review URL: http://codereview.chromium.org/399068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gears_integration.cc')
| -rw-r--r-- | chrome/browser/gears_integration.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc index da08df3..83da75f 100644 --- a/chrome/browser/gears_integration.cc +++ b/chrome/browser/gears_integration.cc @@ -5,6 +5,7 @@ #include "chrome/browser/gears_integration.h" #include "app/gfx/codec/png_codec.h" +#include "base/base64.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -12,7 +13,6 @@ #include "chrome/common/chrome_plugin_util.h" #include "chrome/common/gears_api.h" #include "googleurl/src/gurl.h" -#include "net/base/base64.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/dom_operations.h" @@ -122,7 +122,7 @@ static GURL ConvertSkBitmapToDataURL(const SkBitmap& icon) { std::string icon_data_str(reinterpret_cast<char*>(&icon_data[0]), icon_data.size()); std::string icon_base64_encoded; - net::Base64Encode(icon_data_str, &icon_base64_encoded); + base::Base64Encode(icon_data_str, &icon_base64_encoded); GURL icon_url("data:image/png;base64," + icon_base64_encoded); return icon_url; |