chrome/browser/chromeos/login/webui_login_view.cc - Issue 13926012: Move media_stream_infobar_delegate.* from c/b/ui/ to c/b/media/.

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

Issue 13926012: Move media_stream_infobar_delegate.* from c/b/ui/ to c/b/media/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/media/chrome_webrtc_browsertest.cc » ('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/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/debug/trace_event.h"	11 #include "base/debug/trace_event.h"

12 #include "base/i18n/rtl.h"	12 #include "base/i18n/rtl.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/chromeos/accessibility/accessibility_util.h"	15 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

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

17 #include "chrome/browser/chromeos/login/base_login_display_host.h"	17 #include "chrome/browser/chromeos/login/base_login_display_host.h"

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

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

	20 #include "chrome/browser/media/media_stream_infobar_delegate.h"

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

21 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"	22 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"

22 #include "chrome/browser/profiles/profile_manager.h"	23 #include "chrome/browser/profiles/profile_manager.h"

23 #include "chrome/browser/renderer_preferences_util.h"	24 #include "chrome/browser/renderer_preferences_util.h"

24 #include "chrome/browser/ui/media_stream_infobar_delegate.h"

25 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"	25 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

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

27 #include "chrome/common/chrome_notification_types.h"	27 #include "chrome/common/chrome_notification_types.h"

28 #include "chrome/common/render_messages.h"	28 #include "chrome/common/render_messages.h"

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

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

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

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

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

34 #include "content/public/browser/render_widget_host_view.h"	34 #include "content/public/browser/render_widget_host_view.h"

(...skipping 343 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
378 aura::Env::GetInstance()->set_render_white_bg(true);	378 aura::Env::GetInstance()->set_render_white_bg(true);

379 }	379 }

380	380

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

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

383 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);	383 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);

384 GetWidget()->Activate();	384 GetWidget()->Activate();

385 }	385 }

386	386

387 } // namespace chromeos	387 } // namespace chromeos

OLD	NEW