Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: chrome/browser/ui/libgtk2ui/gconf_listener.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/app_indicator_icon.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_status_icon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gconf_listener.cc
diff --git a/chrome/browser/ui/libgtk2ui/gconf_listener.cc b/chrome/browser/ui/libgtk2ui/gconf_listener.cc
index 30879ea2b8162617193a512114f4b1c901406b81..969910fce227d4312d4b35110ef8e575ec6a161f 100644
--- a/chrome/browser/ui/libgtk2ui/gconf_listener.cc
+++ b/chrome/browser/ui/libgtk2ui/gconf_listener.cc
@@ -6,10 +6,11 @@
#include <gtk/gtk.h>
+#include <memory>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/environment.h"
-#include "base/memory/scoped_ptr.h"
#include "base/nix/xdg_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_tokenizer.h"
@@ -44,7 +45,7 @@ namespace libgtk2ui {
GConfListener::GConfListener(Gtk2UI* delegate)
: delegate_(delegate),
client_(NULL) {
- scoped_ptr<base::Environment> env(base::Environment::Create());
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
base::nix::DesktopEnvironment de =
base::nix::GetDesktopEnvironment(env.get());
if (de == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
« no previous file with comments | « chrome/browser/ui/libgtk2ui/app_indicator_icon.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_status_icon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698