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

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

Issue 1778873002: Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KAObserver
Patch Set: replace the commented dcheck by a dlog Created 4 years, 9 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 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 17 matching lines...) Expand all
28 #include "content/public/browser/notification_observer.h" 28 #include "content/public/browser/notification_observer.h"
29 #include "content/public/browser/notification_registrar.h" 29 #include "content/public/browser/notification_registrar.h"
30 #include "content/public/browser/web_contents_observer.h" 30 #include "content/public/browser/web_contents_observer.h"
31 #include "ui/gfx/display_observer.h" 31 #include "ui/gfx/display_observer.h"
32 #include "ui/gfx/geometry/rect.h" 32 #include "ui/gfx/geometry/rect.h"
33 #include "ui/keyboard/keyboard_controller_observer.h" 33 #include "ui/keyboard/keyboard_controller_observer.h"
34 #include "ui/views/widget/widget_removals_observer.h" 34 #include "ui/views/widget/widget_removals_observer.h"
35 #include "ui/wm/public/scoped_drag_drop_disabler.h" 35 #include "ui/wm/public/scoped_drag_drop_disabler.h"
36 36
37 class PrefService; 37 class PrefService;
38 class ScopedKeepAlive;
38 39
39 namespace content { 40 namespace content {
40 class RenderFrameHost; 41 class RenderFrameHost;
41 class WebContents; 42 class WebContents;
42 } 43 }
43 44
44 namespace chromeos { 45 namespace chromeos {
45 46
46 class DemoAppLauncher; 47 class DemoAppLauncher;
47 class FocusRingController; 48 class FocusRingController;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 scoped_ptr<WizardController> wizard_controller_; 212 scoped_ptr<WizardController> wizard_controller_;
212 213
213 scoped_ptr<SignInScreenController> signin_screen_controller_; 214 scoped_ptr<SignInScreenController> signin_screen_controller_;
214 215
215 // App launch controller. 216 // App launch controller.
216 scoped_ptr<AppLaunchController> app_launch_controller_; 217 scoped_ptr<AppLaunchController> app_launch_controller_;
217 218
218 // Demo app launcher. 219 // Demo app launcher.
219 scoped_ptr<DemoAppLauncher> demo_app_launcher_; 220 scoped_ptr<DemoAppLauncher> demo_app_launcher_;
220 221
222 // Make sure chrome won't exit while we are at login/oobe screen.
223 scoped_ptr<ScopedKeepAlive> keep_alive_;
224
221 // Has ShutdownDisplayHost() already been called? Used to avoid posting our 225 // Has ShutdownDisplayHost() already been called? Used to avoid posting our
222 // own deletion to the message loop twice if the user logs out while we're 226 // own deletion to the message loop twice if the user logs out while we're
223 // still in the process of cleaning up after login (http://crbug.com/134463). 227 // still in the process of cleaning up after login (http://crbug.com/134463).
224 bool shutting_down_; 228 bool shutting_down_;
225 229
226 // Whether progress bar is shown on the OOBE page. 230 // Whether progress bar is shown on the OOBE page.
227 bool oobe_progress_bar_visible_; 231 bool oobe_progress_bar_visible_;
228 232
229 // True if session start is in progress. 233 // True if session start is in progress.
230 bool session_starting_; 234 bool session_starting_;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 313
310 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_; 314 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
311 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_; 315 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
312 316
313 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 317 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
314 }; 318 };
315 319
316 } // namespace chromeos 320 } // namespace chromeos
317 321
318 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 322 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | 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