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

Side by Side Diff: chrome/browser/ui/app_list/app_list_service_views.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 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/ui/app_list/app_list_service_views.h" 5 #include "chrome/browser/ui/app_list/app_list_service_views.h"
6 6
7 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" 7 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
8 #include "chrome/browser/ui/app_list/scoped_keep_alive.h" 8 #include "chrome/browser/ui/app_list/scoped_keep_alive.h"
9 9
10 AppListServiceViews::AppListServiceViews( 10 AppListServiceViews::AppListServiceViews(
(...skipping 13 matching lines...) Expand all
24 void AppListServiceViews::Init(Profile* initial_profile) { 24 void AppListServiceViews::Init(Profile* initial_profile) {
25 PerformStartupChecks(initial_profile); 25 PerformStartupChecks(initial_profile);
26 } 26 }
27 27
28 void AppListServiceViews::CreateForProfile(Profile* requested_profile) { 28 void AppListServiceViews::CreateForProfile(Profile* requested_profile) {
29 shower_.CreateViewForProfile(requested_profile); 29 shower_.CreateViewForProfile(requested_profile);
30 } 30 }
31 31
32 void AppListServiceViews::ShowForProfile(Profile* requested_profile) { 32 void AppListServiceViews::ShowForProfile(Profile* requested_profile) {
33 DCHECK(requested_profile); 33 DCHECK(requested_profile);
34 if (requested_profile->IsManaged()) 34 if (requested_profile->IsSupervised())
35 return; 35 return;
36 36
37 ScopedKeepAlive keep_alive; 37 ScopedKeepAlive keep_alive;
38 38
39 InvalidatePendingProfileLoads(); 39 InvalidatePendingProfileLoads();
40 SetProfilePath(requested_profile->GetPath()); 40 SetProfilePath(requested_profile->GetPath());
41 shower_.ShowForProfile(requested_profile); 41 shower_.ShowForProfile(requested_profile);
42 RecordAppListLaunch(); 42 RecordAppListLaunch();
43 } 43 }
44 44
(...skipping 17 matching lines...) Expand all
62 } 62 }
63 63
64 AppListControllerDelegate* AppListServiceViews::GetControllerDelegate() { 64 AppListControllerDelegate* AppListServiceViews::GetControllerDelegate() {
65 return controller_delegate_.get(); 65 return controller_delegate_.get();
66 } 66 }
67 67
68 AppListControllerDelegate* 68 AppListControllerDelegate*
69 AppListServiceViews::GetControllerDelegateForCreate() { 69 AppListServiceViews::GetControllerDelegateForCreate() {
70 return controller_delegate_.get(); 70 return controller_delegate_.get();
71 } 71 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698