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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_view.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

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/chromeos/login/webui_login_view.h"	5 #include "chrome/browser/chromeos/login/webui_login_view.h"

6	6

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

8 #include "ash/system/tray/system_tray.h"	8 #include "ash/system/tray/system_tray.h"

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

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

11 #include "base/i18n/rtl.h"	11 #include "base/i18n/rtl.h"

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

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

14 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"	14 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

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

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

17 #include "chrome/browser/chromeos/dbus/session_manager_client.h"

18 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"	16 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"

19 #include "chrome/browser/chromeos/login/webui_login_display.h"	17 #include "chrome/browser/chromeos/login/webui_login_display.h"

20 #include "chrome/browser/chromeos/status/status_area_view.h"	18 #include "chrome/browser/chromeos/status/status_area_view.h"

21 #include "chrome/browser/profiles/profile_manager.h"	19 #include "chrome/browser/profiles/profile_manager.h"

22 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"	20 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"

23 #include "chrome/browser/ui/views/dom_view.h"	21 #include "chrome/browser/ui/views/dom_view.h"

24 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	22 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

25 #include "chrome/common/chrome_notification_types.h"	23 #include "chrome/common/chrome_notification_types.h"

26 #include "chrome/common/render_messages.h"	24 #include "chrome/common/render_messages.h"

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

	26 #include "chromeos/dbus/session_manager_client.h"

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

28 #include "content/public/browser/render_view_host_observer.h"	28 #include "content/public/browser/render_view_host_observer.h"

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

30 #include "content/public/browser/web_ui.h"	30 #include "content/public/browser/web_ui.h"

31 #include "ui/gfx/rect.h"	31 #include "ui/gfx/rect.h"

32 #include "ui/gfx/size.h"	32 #include "ui/gfx/size.h"

33 #include "ui/views/widget/widget.h"	33 #include "ui/views/widget/widget.h"

34	34

35 #if defined(USE_VIRTUAL_KEYBOARD)	35 #if defined(USE_VIRTUAL_KEYBOARD)

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

(...skipping 387 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
424 }	424 }

425	425

426 void WebUILoginView::ReturnFocus(bool reverse) {	426 void WebUILoginView::ReturnFocus(bool reverse) {

427 // Return the focus to the web contents.	427 // Return the focus to the web contents.

428 webui_login_->dom_contents()->web_contents()->	428 webui_login_->dom_contents()->web_contents()->

429 FocusThroughTabTraversal(reverse);	429 FocusThroughTabTraversal(reverse);

430 GetWidget()->Activate();	430 GetWidget()->Activate();

431 }	431 }

432	432

433 } // namespace chromeos	433 } // namespace chromeos

OLD	NEW