chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 8 years, 8 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 | « chrome/browser/ui/webui/about_ui.cc ('k') | chrome/browser/ui/webui/help/version_updater_chromeos.h » ('j') | no next file with comments »

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

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

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

11 #include "base/hash_tables.h"	11 #include "base/hash_tables.h"

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

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

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

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/browser_shutdown.h"	16 #include "chrome/browser/browser_shutdown.h"

17 #include "chrome/browser/chromeos/cros/cros_library.h"	17 #include "chrome/browser/chromeos/cros/cros_library.h"

18 #include "chrome/browser/chromeos/cros/network_library.h"	18 #include "chrome/browser/chromeos/cros/network_library.h"

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

20 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

21 #include "chrome/browser/chromeos/dbus/power_manager_client.h"

22 #include "chrome/browser/chromeos/input_method/input_method_manager.h"	20 #include "chrome/browser/chromeos/input_method/input_method_manager.h"

23 #include "chrome/browser/chromeos/input_method/xkeyboard.h"	21 #include "chrome/browser/chromeos/input_method/xkeyboard.h"

24 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"	22 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

25 #include "chrome/browser/chromeos/login/authenticator.h"	23 #include "chrome/browser/chromeos/login/authenticator.h"

26 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"	24 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"

27 #include "chrome/browser/chromeos/login/screen_locker.h"	25 #include "chrome/browser/chromeos/login/screen_locker.h"

28 #include "chrome/browser/chromeos/login/user.h"	26 #include "chrome/browser/chromeos/login/user.h"

29 #include "chrome/browser/chromeos/login/webui_login_display.h"	27 #include "chrome/browser/chromeos/login/webui_login_display.h"

30 #include "chrome/browser/io_thread.h"	28 #include "chrome/browser/io_thread.h"

31 #include "chrome/browser/profiles/profile.h"	29 #include "chrome/browser/profiles/profile.h"

32 #include "chrome/common/chrome_notification_types.h"	30 #include "chrome/common/chrome_notification_types.h"

33 #include "chrome/common/chrome_switches.h"	31 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/net/gaia/gaia_urls.h"	32 #include "chrome/common/net/gaia/gaia_urls.h"

35 #include "chrome/common/url_constants.h"	33 #include "chrome/common/url_constants.h"

	34 #include "chromeos/dbus/dbus_thread_manager.h"

	35 #include "chromeos/dbus/power_manager_client.h"

36 #include "content/public/browser/notification_observer.h"	36 #include "content/public/browser/notification_observer.h"

37 #include "content/public/browser/notification_registrar.h"	37 #include "content/public/browser/notification_registrar.h"

38 #include "content/public/browser/notification_service.h"	38 #include "content/public/browser/notification_service.h"

39 #include "content/public/browser/render_view_host.h"	39 #include "content/public/browser/render_view_host.h"

40 #include "content/public/browser/web_contents.h"	40 #include "content/public/browser/web_contents.h"

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

42 #include "ui/base/l10n/l10n_util.h"	42 #include "ui/base/l10n/l10n_util.h"

43	43

44 #if defined(USE_AURA)	44 #if defined(USE_AURA)

45 #include "ash/shell.h"	45 #include "ash/shell.h"

(...skipping 963 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1009 !dns_clear_task_running_ &&	1009 !dns_clear_task_running_ &&

1010 network_state_informer_->is_online()) {	1010 network_state_informer_->is_online()) {

1011 gaia_silent_load_ = true;	1011 gaia_silent_load_ = true;

1012 gaia_silent_load_network_ =	1012 gaia_silent_load_network_ =

1013 network_state_informer_->active_network_service_path();	1013 network_state_informer_->active_network_service_path();

1014 LoadAuthExtension(true, true, false);	1014 LoadAuthExtension(true, true, false);

1015 }	1015 }

1016 }	1016 }

1017	1017

1018 } // namespace chromeos	1018 } // namespace chromeos

OLD	NEW