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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_image_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_USER_IMAGE_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/chromeos/camera_presence_notifier.h" 10 #include "chrome/browser/chromeos/camera_presence_notifier.h"
(...skipping 19 matching lines...) Expand all
30 class UserImageManager; 30 class UserImageManager;
31 class ScreenManager; 31 class ScreenManager;
32 32
33 class UserImageScreen : public BaseScreen, 33 class UserImageScreen : public BaseScreen,
34 public UserImageScreenActor::Delegate, 34 public UserImageScreenActor::Delegate,
35 public ImageDecoder::Delegate, 35 public ImageDecoder::Delegate,
36 public content::NotificationObserver, 36 public content::NotificationObserver,
37 public UserImageSyncObserver::Observer, 37 public UserImageSyncObserver::Observer,
38 public CameraPresenceNotifier::Observer { 38 public CameraPresenceNotifier::Observer {
39 public: 39 public:
40 UserImageScreen(ScreenObserver* screen_observer, 40 UserImageScreen(BaseScreenDelegate* base_screen_delegate,
41 UserImageScreenActor* actor); 41 UserImageScreenActor* actor);
42 virtual ~UserImageScreen(); 42 virtual ~UserImageScreen();
43 43
44 static UserImageScreen* Get(ScreenManager* manager); 44 static UserImageScreen* Get(ScreenManager* manager);
45 45
46 // BaseScreen implementation: 46 // BaseScreen implementation:
47 virtual void PrepareToShow() override; 47 virtual void PrepareToShow() override;
48 virtual void Show() override; 48 virtual void Show() override;
49 virtual void Hide() override; 49 virtual void Hide() override;
50 virtual std::string GetName() const override; 50 virtual std::string GetName() const override;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 // True if user has explicitly selected some image. 143 // True if user has explicitly selected some image.
144 bool user_has_selected_image_; 144 bool user_has_selected_image_;
145 145
146 DISALLOW_COPY_AND_ASSIGN(UserImageScreen); 146 DISALLOW_COPY_AND_ASSIGN(UserImageScreen);
147 }; 147 };
148 148
149 } // namespace chromeos 149 } // namespace chromeos
150 150
151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_ 151 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698