chrome/browser/extensions/convert_user_script.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/browser/extensions/convert_user_script.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

Index: chrome/browser/extensions/convert_user_script.cc

diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc

index 60eb72cbad97beeb27d73326edb153fcb9b00d1c..8d7aafec716890d08a1b67e1ab3b6f0427b9874f 100644

--- a/chrome/browser/extensions/convert_user_script.cc

+++ b/chrome/browser/extensions/convert_user_script.cc

@@ -10,10 +10,9 @@

#include "base/base64.h"

#include "base/file_path.h"

#include "base/file_util.h"

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

#include "base/path_service.h"

+#include "base/scoped_temp_dir.h"

#include "base/string_util.h"

-#include "crypto/sha2.h"

#include "chrome/browser/extensions/user_script_master.h"

#include "chrome/common/chrome_paths.h"

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

@@ -21,6 +20,7 @@

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

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

#include "content/common/json_value_serializer.h"

+#include "crypto/sha2.h"

#include "googleurl/src/gurl.h"

namespace keys = extension_manifest_keys;

« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/extensions/convert_user_script_unittest.cc » ('j') | no next file with comments »