chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

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/supervised/supervised_user_creation_screen.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 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

« no previous file with comments | « chrome/browser/chromeos/first_run/steps/tray_step.cc ('k') | chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.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/supervised/supervised_user_creation_scre en.h"	5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"

6	6

	7 #include "ash/common/shelf/shelf.h"

7 #include "ash/desktop_background/desktop_background_controller.h"	8 #include "ash/desktop_background/desktop_background_controller.h"

8 #include "ash/shelf/shelf.h"

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

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

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

12 #include "chrome/browser/chromeos/camera_detector.h"	12 #include "chrome/browser/chromeos/camera_detector.h"

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

14 #include "chrome/browser/chromeos/login/existing_user_controller.h"	14 #include "chrome/browser/chromeos/login/existing_user_controller.h"

15 #include "chrome/browser/chromeos/login/screen_manager.h"	15 #include "chrome/browser/chromeos/login/screen_manager.h"

16 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"	16 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"

17 #include "chrome/browser/chromeos/login/screens/error_screen.h"	17 #include "chrome/browser/chromeos/login/screens/error_screen.h"

18 #include "chrome/browser/chromeos/login/screens/network_error.h"	18 #include "chrome/browser/chromeos/login/screens/network_error.h"

(...skipping 609 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
628 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;	628 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;

629 } else {	629 } else {

630 NOTREACHED() << "Unexpected image type: " << image_type;	630 NOTREACHED() << "Unexpected image type: " << image_type;

631 }	631 }

632 }	632 }

633	633

634 void SupervisedUserCreationScreen::OnImageAccepted() {	634 void SupervisedUserCreationScreen::OnImageAccepted() {

635 }	635 }

636	636

637 } // namespace chromeos	637 } // namespace chromeos

OLD	NEW