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

Side by Side Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.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_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h" 13 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
14 14
15 class AccountId; 15 class AccountId;
16 16
17 namespace base { 17 namespace base {
18 class FilePath; 18 class FilePath;
19 } 19 }
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
(...skipping 10 matching lines...) Expand all
33 33
34 static const char kDemoAppId[]; 34 static const char kDemoAppId[];
35 35
36 private: 36 private:
37 friend class DemoAppLauncherTest; 37 friend class DemoAppLauncherTest;
38 38
39 // KioskProfileLoader::Delegate overrides: 39 // KioskProfileLoader::Delegate overrides:
40 void OnProfileLoaded(Profile* profile) override; 40 void OnProfileLoaded(Profile* profile) override;
41 void OnProfileLoadFailed(KioskAppLaunchError::Error error) override; 41 void OnProfileLoadFailed(KioskAppLaunchError::Error error) override;
42 42
43 scoped_ptr<KioskProfileLoader> kiosk_profile_loader_; 43 std::unique_ptr<KioskProfileLoader> kiosk_profile_loader_;
44 44
45 static base::FilePath* demo_app_path_; 45 static base::FilePath* demo_app_path_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(DemoAppLauncher); 47 DISALLOW_COPY_AND_ASSIGN(DemoAppLauncher);
48 }; 48 };
49 49
50 } // namespace chromeos 50 } // namespace chromeos
51 51
52 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_ 52 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_DEMO_MODE_DEMO_APP_LAUNCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698