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

Side by Side Diff: chrome/browser/chromeos/login/screens/terms_of_service_screen.h

Issue 679133002: ScreenObserver is renamed to BaseScreenDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 1 month 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/timer/timer.h" 11 #include "base/timer/timer.h"
12 #include "chrome/browser/chromeos/login/screens/base_screen.h" 12 #include "chrome/browser/chromeos/login/screens/base_screen.h"
13 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h" 13 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
14 #include "net/url_request/url_fetcher_delegate.h" 14 #include "net/url_request/url_fetcher_delegate.h"
15 15
16 namespace net { 16 namespace net {
17 class URLFetcher; 17 class URLFetcher;
18 } 18 }
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 class ScreenObserver; 22 class BaseScreenDelegate;
23 23
24 // A screen that shows Terms of Service which have been configured through 24 // A screen that shows Terms of Service which have been configured through
25 // policy. The screen is shown during login and requires the user to accept the 25 // policy. The screen is shown during login and requires the user to accept the
26 // Terms of Service before proceeding. Currently, Terms of Service are available 26 // Terms of Service before proceeding. Currently, Terms of Service are available
27 // for public sessions only. 27 // for public sessions only.
28 class TermsOfServiceScreen : public BaseScreen, 28 class TermsOfServiceScreen : public BaseScreen,
29 public TermsOfServiceScreenActor::Delegate, 29 public TermsOfServiceScreenActor::Delegate,
30 public net::URLFetcherDelegate { 30 public net::URLFetcherDelegate {
31 public: 31 public:
32 TermsOfServiceScreen(ScreenObserver* screen_observer, 32 TermsOfServiceScreen(BaseScreenDelegate* base_screen_delegate,
33 TermsOfServiceScreenActor* actor); 33 TermsOfServiceScreenActor* actor);
34 virtual ~TermsOfServiceScreen(); 34 virtual ~TermsOfServiceScreen();
35 35
36 // BaseScreen: 36 // BaseScreen:
37 virtual void PrepareToShow() override; 37 virtual void PrepareToShow() override;
38 virtual void Show() override; 38 virtual void Show() override;
39 virtual void Hide() override; 39 virtual void Hide() override;
40 virtual std::string GetName() const override; 40 virtual std::string GetName() const override;
41 41
42 // TermsOfServiceScreenActor::Delegate: 42 // TermsOfServiceScreenActor::Delegate:
(...skipping 18 matching lines...) Expand all
61 // Timer that enforces a custom (shorter) timeout on the attempt to download 61 // Timer that enforces a custom (shorter) timeout on the attempt to download
62 // the Terms of Service. 62 // the Terms of Service.
63 base::OneShotTimer<TermsOfServiceScreen> download_timer_; 63 base::OneShotTimer<TermsOfServiceScreen> download_timer_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen); 65 DISALLOW_COPY_AND_ASSIGN(TermsOfServiceScreen);
66 }; 66 };
67 67
68 } // namespace chromeos 68 } // namespace chromeos
69 69
70 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_ 70 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698