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/ui/login_display_host_impl.h

Issue 572873002: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build break fixed Created 6 years, 3 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 // A focus ring controller to draw focus ring around view for keyboard 292 // A focus ring controller to draw focus ring around view for keyboard
293 // driven oobe. 293 // driven oobe.
294 scoped_ptr<FocusRingController> focus_ring_controller_; 294 scoped_ptr<FocusRingController> focus_ring_controller_;
295 295
296 // Handles special keys for keyboard driven oobe. 296 // Handles special keys for keyboard driven oobe.
297 scoped_ptr<KeyboardDrivenOobeKeyHandler> keyboard_driven_oobe_key_handler_; 297 scoped_ptr<KeyboardDrivenOobeKeyHandler> keyboard_driven_oobe_key_handler_;
298 298
299 FinalizeAnimationType finalize_animation_type_; 299 FinalizeAnimationType finalize_animation_type_;
300 300
301 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
302
303 // Time when login prompt visible signal is received. Used for 301 // Time when login prompt visible signal is received. Used for
304 // calculations of delay before startup sound. 302 // calculations of delay before startup sound.
305 base::TimeTicks login_prompt_visible_time_; 303 base::TimeTicks login_prompt_visible_time_;
306 304
307 // True when request to play startup sound was sent to 305 // True when request to play startup sound was sent to
308 // SoundsManager. 306 // SoundsManager.
309 bool startup_sound_played_; 307 bool startup_sound_played_;
310 308
311 // When true, startup sound should be played only when spoken 309 // When true, startup sound should be played only when spoken
312 // feedback is enabled. Otherwise, startup sound should be played 310 // feedback is enabled. Otherwise, startup sound should be played
313 // in any case. 311 // in any case.
314 bool startup_sound_honors_spoken_feedback_; 312 bool startup_sound_honors_spoken_feedback_;
315 313
316 // True is subscribed as keyboard controller observer. 314 // True is subscribed as keyboard controller observer.
317 bool is_observing_keyboard_; 315 bool is_observing_keyboard_;
318 316
319 // The bounds of the virtual keyboard. 317 // The bounds of the virtual keyboard.
320 gfx::Rect keyboard_bounds_; 318 gfx::Rect keyboard_bounds_;
321 319
322 #if defined(USE_ATHENA) 320 #if defined(USE_ATHENA)
323 scoped_ptr<aura::Window> login_screen_container_; 321 scoped_ptr<aura::Window> login_screen_container_;
324 #endif 322 #endif
325 323
324 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
325
326 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 326 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
327 }; 327 };
328 328
329 } // namespace chromeos 329 } // namespace chromeos
330 330
331 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 331 #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