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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.h

Issue 841103003: Fix WeakPtrFactory member in LoginDisplayHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 void TryToPlayStartupSound(); 202 void TryToPlayStartupSound();
203 203
204 // Called when login-prompt-visible signal is caught. 204 // Called when login-prompt-visible signal is caught.
205 void OnLoginPromptVisible(); 205 void OnLoginPromptVisible();
206 206
207 // Used to calculate position of the screens and background. 207 // Used to calculate position of the screens and background.
208 gfx::Rect background_bounds_; 208 gfx::Rect background_bounds_;
209 209
210 content::NotificationRegistrar registrar_; 210 content::NotificationRegistrar registrar_;
211 211
212 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
213
214 // Default LoginDisplayHost. 212 // Default LoginDisplayHost.
215 static LoginDisplayHost* default_host_; 213 static LoginDisplayHost* default_host_;
216 214
217 // The controller driving the auto-enrollment check. 215 // The controller driving the auto-enrollment check.
218 scoped_ptr<AutoEnrollmentController> auto_enrollment_controller_; 216 scoped_ptr<AutoEnrollmentController> auto_enrollment_controller_;
219 217
220 // Sign in screen controller. 218 // Sign in screen controller.
221 scoped_ptr<ExistingUserController> existing_user_controller_; 219 scoped_ptr<ExistingUserController> existing_user_controller_;
222 220
223 // OOBE and some screens (camera, recovery) controller. 221 // OOBE and some screens (camera, recovery) controller.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 // True is subscribed as keyboard controller observer. 316 // True is subscribed as keyboard controller observer.
319 bool is_observing_keyboard_; 317 bool is_observing_keyboard_;
320 318
321 // The bounds of the virtual keyboard. 319 // The bounds of the virtual keyboard.
322 gfx::Rect keyboard_bounds_; 320 gfx::Rect keyboard_bounds_;
323 321
324 #if defined(USE_ATHENA) 322 #if defined(USE_ATHENA)
325 scoped_ptr<aura::Window> login_screen_container_; 323 scoped_ptr<aura::Window> login_screen_container_;
326 #endif 324 #endif
327 325
326 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
328 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_; 327 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
329 328
330 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 329 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
331 }; 330 };
332 331
333 } // namespace chromeos 332 } // namespace chromeos
334 333
335 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 334 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698