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

Side by Side Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/webui/signin/user_manager_screen_handler.h" 5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/value_conversions.h" 9 #include "base/value_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 21 matching lines...) Expand all
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/base/webui/web_ui_util.h" 36 #include "ui/base/webui/web_ui_util.h"
37 #include "ui/gfx/image/image.h" 37 #include "ui/gfx/image/image.h"
38 #include "ui/gfx/image/image_skia.h" 38 #include "ui/gfx/image/image_skia.h"
39 #include "ui/gfx/image/image_util.h" 39 #include "ui/gfx/image/image_util.h"
40 40
41 #if defined(ENABLE_MANAGED_USERS) 41 #if defined(ENABLE_MANAGED_USERS)
42 #include "chrome/browser/managed_mode/managed_user_service.h" 42 #include "chrome/browser/supervised_user/supervised_user_service.h"
43 #endif 43 #endif
44 44
45 namespace { 45 namespace {
46 // User dictionary keys. 46 // User dictionary keys.
47 const char kKeyUsername[] = "username"; 47 const char kKeyUsername[] = "username";
48 const char kKeyDisplayName[]= "displayName"; 48 const char kKeyDisplayName[]= "displayName";
49 const char kKeyEmailAddress[] = "emailAddress"; 49 const char kKeyEmailAddress[] = "emailAddress";
50 const char kKeyProfilePath[] = "profilePath"; 50 const char kKeyProfilePath[] = "profilePath";
51 const char kKeyPublicAccount[] = "publicAccount"; 51 const char kKeyPublicAccount[] = "publicAccount";
52 const char kKeyLocallyManagedUser[] = "locallyManagedUser"; 52 const char kKeyLocallyManagedUser[] = "locallyManagedUser";
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 } else { 644 } else {
645 web_ui()->CallJavascriptFunction( 645 web_ui()->CallJavascriptFunction(
646 "cr.ui.Oobe.showSignInError", 646 "cr.ui.Oobe.showSignInError",
647 base::FundamentalValue(0), 647 base::FundamentalValue(0),
648 base::StringValue( 648 base::StringValue(
649 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_AUTHENTICATING)), 649 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_AUTHENTICATING)),
650 base::StringValue(""), 650 base::StringValue(""),
651 base::FundamentalValue(0)); 651 base::FundamentalValue(0));
652 } 652 }
653 } 653 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/managed_user_import_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698