chrome/browser/browser_main_win.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/browser_main_win.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/browser_main_win.cc

diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc

index ad74709479e6aa15c1876cd7a99ce3fad204d022..856225259bd2563f4716cc2a6a5b6baecbf5e06d 100644

--- a/chrome/browser/browser_main_win.cc

+++ b/chrome/browser/browser_main_win.cc

@@ -5,22 +5,21 @@

#include "chrome/browser/browser_main.h"

#include "chrome/browser/browser_main_win.h"

-#include <shellapi.h>

#include <windows.h>

+#include <shellapi.h>

#include <algorithm>

#include "base/command_line.h"

#include "base/environment.h"

#include "base/i18n/rtl.h"

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

#include "base/memory/scoped_ptr.h"

#include "base/path_service.h"

+#include "base/scoped_native_library.h"

#include "base/time.h"

#include "base/utf_string_conversions.h"

#include "base/win/windows_version.h"

#include "base/win/wrapped_window_proc.h"

-#include "crypto/nss_util.h"

#include "chrome/browser/browser_util_win.h"

#include "chrome/browser/first_run/first_run.h"

#include "chrome/browser/metrics/metrics_service.h"

@@ -36,6 +35,7 @@

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

#include "content/common/main_function_params.h"

#include "content/common/result_codes.h"

+#include "crypto/nss_util.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "net/base/winsock_init.h"

« no previous file with comments | « chrome/browser/browser_encoding_uitest.cc ('k') | chrome/browser/chromeos/login/owner_key_utils_unittest.cc » ('j') | no next file with comments »