chrome/browser/chromeos/login/screen_locker.cc - Issue 5043001: Cleanup: Include browser.h -> ui/browser.h [Part 1].

Side by Side Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 5043001: Cleanup: Include browser.h -> ui/browser.h [Part 1]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 #include "chrome/browser/chromeos/login/screen_locker.h"	5 #include "chrome/browser/chromeos/login/screen_locker.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "app/l10n_util.h"	10 #include "app/l10n_util.h"

11 #include "app/resource_bundle.h"	11 #include "app/resource_bundle.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/metrics/histogram.h"	13 #include "base/metrics/histogram.h"

14 #include "base/message_loop.h"	14 #include "base/message_loop.h"

15 #include "base/singleton.h"	15 #include "base/singleton.h"

16 #include "base/string_util.h"	16 #include "base/string_util.h"

17 #include "base/timer.h"	17 #include "base/timer.h"

18 #include "base/utf_string_conversions.h"	18 #include "base/utf_string_conversions.h"

19 #include "chrome/browser/browser.h"

20 #include "chrome/browser/browser_list.h"	19 #include "chrome/browser/browser_list.h"

21 #include "chrome/browser/browser_thread.h"	20 #include "chrome/browser/browser_thread.h"

22 #include "chrome/browser/browser_window.h"	21 #include "chrome/browser/browser_window.h"

23 #include "chrome/browser/chromeos/cros/input_method_library.h"	22 #include "chrome/browser/chromeos/cros/input_method_library.h"

24 #include "chrome/browser/chromeos/cros/keyboard_library.h"	23 #include "chrome/browser/chromeos/cros/keyboard_library.h"

25 #include "chrome/browser/chromeos/cros/login_library.h"	24 #include "chrome/browser/chromeos/cros/login_library.h"

26 #include "chrome/browser/chromeos/cros/screen_lock_library.h"	25 #include "chrome/browser/chromeos/cros/screen_lock_library.h"

27 #include "chrome/browser/chromeos/language_preferences.h"	26 #include "chrome/browser/chromeos/language_preferences.h"

28 #include "chrome/browser/chromeos/login/authenticator.h"	27 #include "chrome/browser/chromeos/login/authenticator.h"

29 #include "chrome/browser/chromeos/login/background_view.h"	28 #include "chrome/browser/chromeos/login/background_view.h"

30 #include "chrome/browser/chromeos/login/login_utils.h"	29 #include "chrome/browser/chromeos/login/login_utils.h"

31 #include "chrome/browser/chromeos/login/message_bubble.h"	30 #include "chrome/browser/chromeos/login/message_bubble.h"

32 #include "chrome/browser/chromeos/login/screen_lock_view.h"	31 #include "chrome/browser/chromeos/login/screen_lock_view.h"

33 #include "chrome/browser/chromeos/login/shutdown_button.h"	32 #include "chrome/browser/chromeos/login/shutdown_button.h"

34 #include "chrome/browser/chromeos/system_key_event_listener.h"	33 #include "chrome/browser/chromeos/system_key_event_listener.h"

35 #include "chrome/browser/chromeos/wm_ipc.h"	34 #include "chrome/browser/chromeos/wm_ipc.h"

36 #include "chrome/browser/metrics/user_metrics.h"	35 #include "chrome/browser/metrics/user_metrics.h"

	36 #include "chrome/browser/ui/browser.h"

37 #include "chrome/common/chrome_switches.h"	37 #include "chrome/common/chrome_switches.h"

38 #include "chrome/common/notification_service.h"	38 #include "chrome/common/notification_service.h"

39 #include "cros/chromeos_wm_ipc_enums.h"	39 #include "cros/chromeos_wm_ipc_enums.h"

40 #include "googleurl/src/gurl.h"	40 #include "googleurl/src/gurl.h"

41 #include "grit/generated_resources.h"	41 #include "grit/generated_resources.h"

42 #include "grit/theme_resources.h"	42 #include "grit/theme_resources.h"

43 #include "views/screen.h"	43 #include "views/screen.h"

44 #include "views/widget/root_view.h"	44 #include "views/widget/root_view.h"

45 #include "views/widget/widget_gtk.h"	45 #include "views/widget/widget_gtk.h"

46	46

(...skipping 874 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
921	921

922 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {	922 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) {

923 if (!background_view_->IsScreenSaverVisible()) {	923 if (!background_view_->IsScreenSaverVisible()) {

924 StartScreenSaver();	924 StartScreenSaver();

925 return true;	925 return true;

926 }	926 }

927 return false;	927 return false;

928 }	928 }

929	929

930 } // namespace chromeos	930 } // namespace chromeos

OLD	NEW