Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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
OLDNEW
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/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chromeos/camera_detector.h" 11 #include "chrome/browser/chromeos/camera_detector.h"
12 #include "chrome/browser/chromeos/login/existing_user_controller.h" 12 #include "chrome/browser/chromeos/login/existing_user_controller.h"
13 #include "chrome/browser/chromeos/login/screens/error_screen.h" 13 #include "chrome/browser/chromeos/login/screens/error_screen.h"
14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
15 #include "chrome/browser/chromeos/login/signin_specifics.h" 15 #include "chrome/browser/chromeos/login/signin_specifics.h"
16 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h" 16 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"
17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h" 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h"
18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller_new.h" 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller_new.h"
19 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 19 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
21 #include "chrome/browser/chromeos/login/wizard_controller.h" 21 #include "chrome/browser/chromeos/login/wizard_controller.h"
22 #include "chrome/browser/supervised_user/supervised_user_constants.h" 22 #include "chrome/browser/supervised_user/supervised_user_constants.h"
23 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service .h" 23 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service .h"
24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service _factory.h" 24 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service _factory.h"
25 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" 25 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
26 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" 26 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
27 #include "chrome/grit/generated_resources.h"
27 #include "chromeos/login/auth/key.h" 28 #include "chromeos/login/auth/key.h"
28 #include "chromeos/login/auth/user_context.h" 29 #include "chromeos/login/auth/user_context.h"
29 #include "chromeos/network/network_state.h" 30 #include "chromeos/network/network_state.h"
30 #include "components/user_manager/user.h" 31 #include "components/user_manager/user.h"
31 #include "components/user_manager/user_image/user_image.h" 32 #include "components/user_manager/user_image/user_image.h"
32 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
33 #include "grit/generated_resources.h"
34 #include "third_party/skia/include/core/SkBitmap.h" 34 #include "third_party/skia/include/core/SkBitmap.h"
35 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/gfx/image/image_skia.h" 36 #include "ui/gfx/image/image_skia.h"
37 37
38 namespace chromeos { 38 namespace chromeos {
39 39
40 namespace { 40 namespace {
41 41
42 // Key for (boolean) value that indicates that user already exists on device. 42 // Key for (boolean) value that indicates that user already exists on device.
43 const char kUserExists[] = "exists"; 43 const char kUserExists[] = "exists";
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 591 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
592 } else { 592 } else {
593 NOTREACHED() << "Unexpected image type: " << image_type; 593 NOTREACHED() << "Unexpected image type: " << image_type;
594 } 594 }
595 } 595 }
596 596
597 void SupervisedUserCreationScreen::OnImageAccepted() { 597 void SupervisedUserCreationScreen::OnImageAccepted() {
598 } 598 }
599 599
600 } // namespace chromeos 600 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698