summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks/bookmark_html_writer.cc
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 23:14:46 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 23:14:46 +0000
commit42eb6b07c2791d8d13ec48ea3c92725eee4d94a2 (patch)
tree9c72c5052409725827617584d7891f1fcd5b5c9e /chrome/browser/bookmarks/bookmark_html_writer.cc
parent60aac62ddf3cc40741a824cae25ab190005513be (diff)
downloadchromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.zip
chromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.tar.gz
chromium_src-42eb6b07c2791d8d13ec48ea3c92725eee4d94a2.tar.bz2
Port some files in chrome/browser/ - part 1.
Review URL: http://codereview.chromium.org/11402 Patch from Pawel Hajdan Jr. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_html_writer.cc')
-rw-r--r--chrome/browser/bookmarks/bookmark_html_writer.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index b6c26ef..cb5cf87 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
+#include "base/file_util.h"
#include "base/message_loop.h"
-#include "base/scoped_handle.h"
+#include "base/platform_file.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "base/time.h"
@@ -14,6 +15,8 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/history/history_types.h"
#include "net/base/escape.h"
+#include "net/base/file_stream.h"
+#include "net/base/net_errors.h"
namespace bookmark_html_writer {
@@ -129,12 +132,8 @@ class Writer : public Task {
// Opens the file, returning true on success.
bool OpenFile() {
- handle_.Set(
- CreateFile(path_.c_str(), GENERIC_WRITE, 0, NULL,
- CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
- if (!handle_.IsValid())
- return false;
- return true;
+ int flags = base::PLATFORM_FILE_CREATE_ALWAYS | base::PLATFORM_FILE_WRITE;
+ return (file_stream_.Open(path_, flags) == net::OK);
}
// Increments the indent.
@@ -151,10 +150,8 @@ class Writer : public Task {
// Writes raw text out returning true on success. This does not escape
// the text in anyway.
bool Write(const std::string& text) {
- DWORD wrote;
- bool result =
- (WriteFile(handle_, text.c_str(), text.length(), &wrote, NULL) &&
- wrote == text.length());
+ size_t wrote = file_stream_.Write(text.c_str(), text.length(), NULL);
+ bool result = (wrote == text.length());
DCHECK(result);
return result;
}
@@ -306,7 +303,7 @@ class Writer : public Task {
std::wstring path_;
// File we're writing to.
- ScopedHandle handle_;
+ net::FileStream file_stream_;
// How much we indent when writing a bookmark/folder. This is modified
// via IncrementIndent and DecrementIndent.