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

Side by Side Diff: chrome/browser/chromeos/login/screens/terms_of_service_screen.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_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 "chrome/browser/chromeos/login/screens/base_screen.h" 13 #include "chrome/browser/chromeos/login/screens/base_screen.h"
13 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h" 14 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
14 #include "net/url_request/url_fetcher_delegate.h" 15 #include "net/url_request/url_fetcher_delegate.h"
15 16
16 namespace net { 17 namespace net {
17 class URLFetcher; 18 class URLFetcher;
18 } 19 }
19 20
20 namespace chromeos { 21 namespace chromeos {
(...skipping 28 matching lines...) Expand all
49 void StartDownload(); 50 void StartDownload();
50 51
51 // Abort the attempt to download the Terms of Service if it takes too long. 52 // Abort the attempt to download the Terms of Service if it takes too long.
52 void OnDownloadTimeout(); 53 void OnDownloadTimeout();
53 54
54 // net::URLFetcherDelegate: 55 // net::URLFetcherDelegate:
55 void OnURLFetchComplete(const net::URLFetcher* source) override; 56 void OnURLFetchComplete(const net::URLFetcher* source) override;
56 57
57 TermsOfServiceScreenActor* actor_; 58 TermsOfServiceScreenActor* actor_;
58 59
59 scoped_ptr<net::URLFetcher> terms_of_service_fetcher_; 60 std::unique_ptr<net::URLFetcher> terms_of_service_fetcher_;
60 61
61 // Timer that enforces a custom (shorter) timeout on the attempt to download 62 // Timer that enforces a custom (shorter) timeout on the attempt to download
62 // the Terms of Service. 63 // the Terms of Service.
63 base::OneShotTimer download_timer_; 64 base::OneShotTimer download_timer_;
64 65
65 DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen); 66 DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen);
66 }; 67 };
67 68
68 } // namespace chromeos 69 } // namespace chromeos
69 70
70 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ 71 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698