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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_status_icon.h

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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gconf_listener.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
11 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h" 12 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
12 #include "ui/base/glib/glib_integers.h" 13 #include "ui/base/glib/glib_integers.h"
13 #include "ui/base/glib/glib_signal.h" 14 #include "ui/base/glib/glib_signal.h"
14 #include "ui/views/linux_ui/status_icon_linux.h" 15 #include "ui/views/linux_ui/status_icon_linux.h"
15 16
16 typedef struct _GtkStatusIcon GtkStatusIcon; 17 typedef struct _GtkStatusIcon GtkStatusIcon;
17 18
18 namespace gfx { 19 namespace gfx {
19 class ImageSkia; 20 class ImageSkia;
(...skipping 24 matching lines...) Expand all
44 45
45 CHROMEG_CALLBACK_2(Gtk2StatusIcon, 46 CHROMEG_CALLBACK_2(Gtk2StatusIcon,
46 void, 47 void,
47 OnContextMenuRequested, 48 OnContextMenuRequested,
48 GtkStatusIcon*, 49 GtkStatusIcon*,
49 guint, 50 guint,
50 guint); 51 guint);
51 52
52 GtkStatusIcon* gtk_status_icon_; 53 GtkStatusIcon* gtk_status_icon_;
53 54
54 scoped_ptr<AppIndicatorIconMenu> menu_; 55 std::unique_ptr<AppIndicatorIconMenu> menu_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(Gtk2StatusIcon); 57 DISALLOW_COPY_AND_ASSIGN(Gtk2StatusIcon);
57 }; 58 };
58 59
59 } // namespace libgtk2ui 60 } // namespace libgtk2ui
60 61
61 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_ 62 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_STATUS_ICON_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gconf_listener.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698