chrome/browser/chromeos/login/ui/user_adding_screen.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test Created 4 years, 5 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

« ash/common/system/tray/system_tray_unittest.cc ('K') | « chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.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/user_adding_screen.h"	5 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

6	6

	7 #include "ash/common/system/tray/system_tray.h"

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

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

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

10 #include "base/memory/singleton.h"	10 #include "base/memory/singleton.h"

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

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

13 #include "chrome/browser/chromeos/login/helper.h"	13 #include "chrome/browser/chromeos/login/helper.h"

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

15 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_cont roller.h"	15 #include "chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_cont roller.h"

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

17 #include "components/session_manager/core/session_manager.h"	17 #include "components/session_manager/core/session_manager.h"

18 #include "components/user_manager/user_manager.h"	18 #include "components/user_manager/user_manager.h"

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111	111

112 UserAddingScreen::UserAddingScreen() {}	112 UserAddingScreen::UserAddingScreen() {}

113 UserAddingScreen::~UserAddingScreen() {}	113 UserAddingScreen::~UserAddingScreen() {}

114	114

115 UserAddingScreen* UserAddingScreen::Get() {	115 UserAddingScreen* UserAddingScreen::Get() {

116 return UserAddingScreenImpl::GetInstance();	116 return UserAddingScreenImpl::GetInstance();

117 }	117 }

118	118

119 } // namespace chromeos	119 } // namespace chromeos

120	120

OLD	NEW