chrome/browser/ui/startup/startup_browser_creator_impl.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

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/ui/startup/startup_browser_creator_impl.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/browser/ui/startup/startup_browser_creator.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

index 7e2acecd9354d8a29bbb2bea2471b2354aa5fa68..6ac0bc7995f6adb478176f1e6f4da8d15eb55410 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -8,6 +8,7 @@

#include <stdint.h>

#include <algorithm>

+#include <memory>

#include <vector>

#include "apps/app_restore_service.h"

@@ -18,7 +19,6 @@

#include "base/compiler_specific.h"

#include "base/environment.h"

#include "base/lazy_instance.h"

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

#include "base/metrics/histogram_macros.h"

#include "base/metrics/statistics_recorder.h"

#include "base/strings/string_number_conversions.h"

@@ -157,7 +157,7 @@ LaunchMode GetLaunchShortcutKind() {

else

return LM_SHORTCUT_QUICKLAUNCH;

}

- scoped_ptr<base::Environment> env(base::Environment::Create());

+ std::unique_ptr<base::Environment> env(base::Environment::Create());

std::string appdata_path;

env->GetVar("USERPROFILE", &appdata_path);

if (!appdata_path.empty() &&