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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_external_updater.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_EXTERNAL_UPDATER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_ 6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "base/sequenced_task_runner.h" 15 #include "base/sequenced_task_runner.h"
16 #include "chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h" 16 #include "chrome/browser/chromeos/app_mode/kiosk_external_update_validator.h"
17 #include "chromeos/disks/disk_mount_manager.h" 17 #include "chromeos/disks/disk_mount_manager.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
21 class KioskExternalUpdateNotification; 21 class KioskExternalUpdateNotification;
22 22
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 // The directory used by SandBoxedUnpacker for unpack extensions. 136 // The directory used by SandBoxedUnpacker for unpack extensions.
137 const base::FilePath crx_unpack_dir_; 137 const base::FilePath crx_unpack_dir_;
138 138
139 // The path where external crx files resides(usb stick mount path). 139 // The path where external crx files resides(usb stick mount path).
140 base::FilePath external_update_path_; 140 base::FilePath external_update_path_;
141 141
142 // map of app_id: ExternalUpdate 142 // map of app_id: ExternalUpdate
143 typedef std::map<std::string, ExternalUpdate> ExternalUpdateMap; 143 typedef std::map<std::string, ExternalUpdate> ExternalUpdateMap;
144 ExternalUpdateMap external_updates_; 144 ExternalUpdateMap external_updates_;
145 scoped_ptr<KioskExternalUpdateNotification> notification_; 145 std::unique_ptr<KioskExternalUpdateNotification> notification_;
146 146
147 base::WeakPtrFactory<KioskExternalUpdater> weak_factory_; 147 base::WeakPtrFactory<KioskExternalUpdater> weak_factory_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(KioskExternalUpdater); 149 DISALLOW_COPY_AND_ASSIGN(KioskExternalUpdater);
150 }; 150 };
151 151
152 } // namespace chromeos 152 } // namespace chromeos
153 153
154 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_ 154 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_EXTERNAL_UPDATER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698