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

Unified Diff: chrome/browser/ui/libgtk2ui/app_indicator_icon.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.h ('k') | chrome/browser/ui/libgtk2ui/gconf_listener.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/app_indicator_icon.cc
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc b/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc
index 776494e1487440d3d42e752c2f40184bbfdd9011..f0e9cec873a4a337bd1fe45dbcf3a996667d3f8d 100644
--- a/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc
+++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon.cc
@@ -89,7 +89,7 @@ void EnsureMethodsLoaded() {
// Only use libappindicator where it is needed to support dbus based status
// icons. In particular, libappindicator does not support a click action.
- scoped_ptr<base::Environment> env(base::Environment::Create());
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
base::nix::DesktopEnvironment environment =
base::nix::GetDesktopEnvironment(env.get());
if (environment != base::nix::DESKTOP_ENVIRONMENT_KDE4 &&
@@ -181,7 +181,7 @@ AppIndicatorIcon::AppIndicatorIcon(std::string id,
menu_model_(NULL),
icon_change_count_(0),
weak_factory_(this) {
- scoped_ptr<base::Environment> env(base::Environment::Create());
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
desktop_env_ = base::nix::GetDesktopEnvironment(env.get());
EnsureMethodsLoaded();
« no previous file with comments | « chrome/browser/ui/libgtk2ui/app_indicator_icon.h ('k') | chrome/browser/ui/libgtk2ui/gconf_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698