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

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

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "content/public/browser/notification_registrar.h" 26 #include "content/public/browser/notification_registrar.h"
27 #include "content/public/browser/web_contents_observer.h" 27 #include "content/public/browser/web_contents_observer.h"
28 #include "ui/gfx/display_observer.h" 28 #include "ui/gfx/display_observer.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 #include "ui/keyboard/keyboard_controller_observer.h" 30 #include "ui/keyboard/keyboard_controller_observer.h"
31 #include "ui/views/widget/widget_removals_observer.h" 31 #include "ui/views/widget/widget_removals_observer.h"
32 #include "ui/wm/public/scoped_drag_drop_disabler.h" 32 #include "ui/wm/public/scoped_drag_drop_disabler.h"
33 33
34 class PrefService; 34 class PrefService;
35 35
36 namespace browser_lifetime {
37 class ScopedKeepAlive;
38 }
39
36 namespace content { 40 namespace content {
37 class RenderFrameHost; 41 class RenderFrameHost;
38 class WebContents; 42 class WebContents;
39 } 43 }
40 44
41 namespace chromeos { 45 namespace chromeos {
42 46
43 class DemoAppLauncher; 47 class DemoAppLauncher;
44 class FocusRingController; 48 class FocusRingController;
45 class KeyboardDrivenOobeKeyHandler; 49 class KeyboardDrivenOobeKeyHandler;
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 bool startup_sound_played_; 303 bool startup_sound_played_;
300 304
301 // When true, startup sound should be played only when spoken 305 // When true, startup sound should be played only when spoken
302 // feedback is enabled. Otherwise, startup sound should be played 306 // feedback is enabled. Otherwise, startup sound should be played
303 // in any case. 307 // in any case.
304 bool startup_sound_honors_spoken_feedback_; 308 bool startup_sound_honors_spoken_feedback_;
305 309
306 // True is subscribed as keyboard controller observer. 310 // True is subscribed as keyboard controller observer.
307 bool is_observing_keyboard_; 311 bool is_observing_keyboard_;
308 312
313 // Keeps the browser alife on the login/oobe screen.
314 scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive_;
315
309 // Keeps a copy of the old Drag'n'Drop client, so that it would be disabled 316 // Keeps a copy of the old Drag'n'Drop client, so that it would be disabled
310 // during a login session and restored afterwards. 317 // during a login session and restored afterwards.
311 scoped_ptr<aura::client::ScopedDragDropDisabler> scoped_drag_drop_disabler_; 318 scoped_ptr<aura::client::ScopedDragDropDisabler> scoped_drag_drop_disabler_;
312 319
313 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_; 320 base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
314 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_; 321 base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
315 322
316 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl); 323 DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
317 }; 324 };
318 325
319 } // namespace chromeos 326 } // namespace chromeos
320 327
321 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_ 328 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.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