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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h

Issue 1870793002: Convert //chrome/browser/chromeos 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
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_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H _ 5 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H _
6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H _ 6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H _
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
12 #include "chromeos/dbus/power_manager_client.h" 13 #include "chromeos/dbus/power_manager_client.h"
13 #include "ui/base/user_activity/user_activity_observer.h" 14 #include "ui/base/user_activity/user_activity_observer.h"
14 15
15 namespace chromeos { 16 namespace chromeos {
16 17
17 class IdleAppNameNotificationView; 18 class IdleAppNameNotificationView;
18 19
19 class KioskModeIdleAppNameNotification : public ui::UserActivityObserver, 20 class KioskModeIdleAppNameNotification : public ui::UserActivityObserver,
20 public PowerManagerClient::Observer { 21 public PowerManagerClient::Observer {
(...skipping 23 matching lines...) Expand all
44 45
45 // Invoked by |timer_| to display the application idle message. 46 // Invoked by |timer_| to display the application idle message.
46 void OnTimeout(); 47 void OnTimeout();
47 48
48 base::OneShotTimer timer_; 49 base::OneShotTimer timer_;
49 50
50 // If set the notification should get shown upon next user activity. 51 // If set the notification should get shown upon next user activity.
51 bool show_notification_upon_next_user_activity_; 52 bool show_notification_upon_next_user_activity_;
52 53
53 // The notification object which owns and shows the notification. 54 // The notification object which owns and shows the notification.
54 scoped_ptr<IdleAppNameNotificationView> notification_; 55 std::unique_ptr<IdleAppNameNotificationView> notification_;
55 56
56 DISALLOW_COPY_AND_ASSIGN(KioskModeIdleAppNameNotification); 57 DISALLOW_COPY_AND_ASSIGN(KioskModeIdleAppNameNotification);
57 }; 58 };
58 59
59 } // namespace chromeos 60 } // namespace chromeos
60 61
61 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATIO N_H_ 62 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATIO N_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_external_updater.h ('k') | chrome/browser/chromeos/app_mode/kiosk_profile_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698