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

Side by Side Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Issue 350183002: Rename "managed (mode|user)" to "supervised user" (part 5) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/profiles/avatar_menu.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/managed/locally_managed_user_creation_sc reen.h" 5 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc reen.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"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 void LocallyManagedUserCreationScreen::OnCreationTimeout() { 413 void LocallyManagedUserCreationScreen::OnCreationTimeout() {
414 if (actor_) { 414 if (actor_) {
415 actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16( 415 actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16(
416 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE)); 416 IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE));
417 } 417 }
418 } 418 }
419 419
420 void LocallyManagedUserCreationScreen::OnLongCreationWarning() { 420 void LocallyManagedUserCreationScreen::OnLongCreationWarning() {
421 if (actor_) { 421 if (actor_) {
422 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16( 422 actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
423 IDS_PROFILES_CREATE_MANAGED_JUST_SIGNED_IN)); 423 IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN));
424 } 424 }
425 } 425 }
426 426
427 bool LocallyManagedUserCreationScreen::FindUserByDisplayName( 427 bool LocallyManagedUserCreationScreen::FindUserByDisplayName(
428 const base::string16& display_name, 428 const base::string16& display_name,
429 std::string *out_id) const { 429 std::string *out_id) const {
430 if (!existing_users_.get()) 430 if (!existing_users_.get())
431 return false; 431 return false;
432 for (base::DictionaryValue::Iterator it(*existing_users_.get()); 432 for (base::DictionaryValue::Iterator it(*existing_users_.get());
433 !it.IsAtEnd(); it.Advance()) { 433 !it.IsAtEnd(); it.Advance()) {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 selected_image_ = User::kExternalImageIndex; 595 selected_image_ = User::kExternalImageIndex;
596 } else { 596 } else {
597 NOTREACHED() << "Unexpected image type: " << image_type; 597 NOTREACHED() << "Unexpected image type: " << image_type;
598 } 598 }
599 } 599 }
600 600
601 void LocallyManagedUserCreationScreen::OnImageAccepted() { 601 void LocallyManagedUserCreationScreen::OnImageAccepted() {
602 } 602 }
603 603
604 } // namespace chromeos 604 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/profiles/avatar_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698