Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2940)

Unified Diff: chrome/browser/gears_integration.cc

Issue 399068: Move base64 from 'net/base' into 'base'. (Closed)
Patch Set: rebase Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/sandboxed_extension_unpacker.cc ('k') | chrome/browser/importer/nss_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gears_integration.cc
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index da08df35993041072bc0d986f980c9a6cb7caa72..83da75fff241b38a410c8088dbf6e05137c15584 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;
« no previous file with comments | « chrome/browser/extensions/sandboxed_extension_unpacker.cc ('k') | chrome/browser/importer/nss_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698