chrome/browser/ui/libgtk2ui/unity_service.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/libgtk2ui/unity_service.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/libgtk2ui/select_file_dialog_impl_gtk2.cc ('k') | chrome/browser/ui/location_bar/location_bar_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/libgtk2ui/unity_service.cc

diff --git a/chrome/browser/ui/libgtk2ui/unity_service.cc b/chrome/browser/ui/libgtk2ui/unity_service.cc

index 549b3617ea106f4e1385ed68d10e766196400180..7bdf8010dba76a1d8738f203046b132bfea3efd6 100644

--- a/chrome/browser/ui/libgtk2ui/unity_service.cc

+++ b/chrome/browser/ui/libgtk2ui/unity_service.cc

@@ -5,12 +5,12 @@

#include "chrome/browser/ui/libgtk2ui/unity_service.h"

#include <dlfcn.h>

-#include <string>

#include <gtk/gtk.h>

+#include <memory>

+#include <string>

#include "base/environment.h"

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

#include "base/nix/xdg_util.h"

#include "chrome/browser/shell_integration_linux.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"

@@ -59,7 +59,7 @@ void EnsureMethodsLoaded() {

return;

attempted_load = true;

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

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

base::nix::DesktopEnvironment desktop_env =

GetDesktopEnvironment(env.get());