chrome/common/extensions/extension_unpacker.cc - Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/extension_unpacker.cc

Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: unknwn Created 9 years, 7 months 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/common/extensions/extension_resource_unittest.cc ('k') | chrome/common/extensions/extension_unpacker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension_unpacker.cc

diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc

index 4c5f30f1acc4c3610b1978380724c14c4ef273d7..9a06bbc34b99813f8323c6f8f696c2b69954c1ae 100644

--- a/chrome/common/extensions/extension_unpacker.cc

+++ b/chrome/common/extensions/extension_unpacker.cc

@@ -8,12 +8,11 @@

#include "base/file_util.h"

#include "base/memory/scoped_handle.h"

-#include "base/memory/scoped_temp_dir.h"

+#include "base/scoped_temp_dir.h"

#include "base/string_util.h"

#include "base/threading/thread.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

-#include "net/base/file_stream.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/extensions/extension_file_util.h"

@@ -23,6 +22,7 @@

#include "content/common/common_param_traits.h"

#include "content/common/json_value_serializer.h"

#include "ipc/ipc_message_utils.h"

+#include "net/base/file_stream.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "webkit/glue/image_decoder.h"

« no previous file with comments | « chrome/common/extensions/extension_resource_unittest.cc ('k') | chrome/common/extensions/extension_unpacker_unittest.cc » ('j') | no next file with comments »