chrome/installer/setup/setup_main.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/installer/setup/setup_main.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/installer/setup/setup_main.cc

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc

index 5211e5c05e085892078bab6f823f14f86c6c2c49..15e08477d8f16faf9119d7e38c665825deb21ef1 100644

--- a/chrome/installer/setup/setup_main.cc

+++ b/chrome/installer/setup/setup_main.cc

@@ -14,9 +14,9 @@

#include "base/command_line.h"

#include "base/file_util.h"

#include "base/file_version_info.h"

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

#include "base/path_service.h"

#include "base/process_util.h"

+#include "base/scoped_temp_dir.h"

#include "base/string_number_conversions.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

@@ -37,14 +37,14 @@

#include "chrome/installer/util/channel_info.h"

#include "chrome/installer/util/delete_after_reboot_helper.h"

#include "chrome/installer/util/delete_tree_work_item.h"

-#include "chrome/installer/util/google_update_settings.h"

#include "chrome/installer/util/google_update_constants.h"

+#include "chrome/installer/util/google_update_settings.h"

#include "chrome/installer/util/helper.h"

#include "chrome/installer/util/html_dialog.h"

#include "chrome/installer/util/install_util.h"

+#include "chrome/installer/util/installation_state.h"

#include "chrome/installer/util/installation_validator.h"

#include "chrome/installer/util/installer_state.h"

-#include "chrome/installer/util/installation_state.h"

#include "chrome/installer/util/l10n_string_util.h"

#include "chrome/installer/util/logging_installer.h"

#include "chrome/installer/util/lzma_util.h"

« no previous file with comments | « chrome/installer/setup/chrome_frame_quick_enable.cc ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »