chrome/browser/chromeos/login/ui/webui_login_display.cc - Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos.

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

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build Created 6 years, 4 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/chromeos/login/ui/simple_web_view_dialog.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"	5 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"

6	6

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

8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

9 #include "chrome/browser/chromeos/login/lock/screen_locker.h"	9 #include "chrome/browser/chromeos/login/lock/screen_locker.h"

10 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"	10 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"

11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

12 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	12 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

14 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"	14 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

	17 #include "chrome/grit/chromium_strings.h"

	18 #include "chrome/grit/generated_resources.h"

17 #include "chromeos/ime/ime_keyboard.h"	19 #include "chromeos/ime/ime_keyboard.h"

18 #include "chromeos/ime/input_method_manager.h"	20 #include "chromeos/ime/input_method_manager.h"

19 #include "chromeos/login/user_names.h"	21 #include "chromeos/login/user_names.h"

20 #include "grit/chromium_strings.h"

21 #include "grit/generated_resources.h"

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

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

24 #include "ui/wm/core/user_activity_detector.h"	24 #include "ui/wm/core/user_activity_detector.h"

25	25

26 namespace chromeos {	26 namespace chromeos {

27	27

28 // WebUILoginDisplay, public: --------------------------------------------------	28 // WebUILoginDisplay, public: --------------------------------------------------

29	29

30 WebUILoginDisplay::~WebUILoginDisplay() {	30 WebUILoginDisplay::~WebUILoginDisplay() {

31 if (webui_handler_)	31 if (webui_handler_)

(...skipping 313 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
345 delegate_->Signout();	345 delegate_->Signout();

346 }	346 }

347	347

348 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {	348 void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {

349 if (delegate_)	349 if (delegate_)

350 delegate_->ResetPublicSessionAutoLoginTimer();	350 delegate_->ResetPublicSessionAutoLoginTimer();

351 }	351 }

352	352

353	353

354 } // namespace chromeos	354 } // namespace chromeos

OLD	NEW