summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_module.cc
diff options
context:
space:
mode:
authorhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
committerhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-24 06:21:53 +0000
commit978df34538607d50bf4690f2d679c1bef860398c (patch)
treeb99abc0b44316c0bfa16374746996ac209e363a6 /chrome/browser/extensions/extension_tabs_module.cc
parent391bbb3fb3fbb0fb7d072878b9cb45e99a519e6e (diff)
downloadchromium_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/extensions/extension_tabs_module.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 059b97f..64ee348 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_tabs_module.h"
#include "app/gfx/codec/jpeg_codec.h"
+#include "base/base64.h"
#include "base/string_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
@@ -22,7 +23,6 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_error_utils.h"
#include "chrome/common/url_constants.h"
-#include "net/base/base64.h"
#include "skia/ext/image_operations.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -804,7 +804,7 @@ bool CaptureVisibleTabFunction::RunImpl() {
reinterpret_cast<const char*>(&jpeg_data->data[0]),
jpeg_data->data.size());
- net::Base64Encode(stream_as_string, &base64_result);
+ base::Base64Encode(stream_as_string, &base64_result);
base64_result.insert(0, "data:image/jpg;base64,");
result_.reset(new StringValue(base64_result));
return true;