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

Side by Side Diff: chrome/browser/extensions/api/autotest_private/autotest_private_api.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/api/autotest_private/autotest_private_api.h" 5 #include "chrome/browser/extensions/api/autotest_private/autotest_private_api.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/extensions/extension_action_manager.h" 9 #include "chrome/browser/extensions/extension_action_manager.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_util.h" 11 #include "chrome/browser/extensions/extension_util.h"
12 #include "chrome/browser/lifetime/application_lifetime.h" 12 #include "chrome/browser/lifetime/application_lifetime.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/common/extensions/api/autotest_private.h" 14 #include "chrome/common/extensions/api/autotest_private.h"
15 #include "chrome/common/extensions/manifest_url_handler.h" 15 #include "chrome/common/extensions/manifest_url_handler.h"
16 #include "extensions/browser/extension_function_registry.h" 16 #include "extensions/browser/extension_function_registry.h"
17 #include "extensions/browser/extension_registry.h" 17 #include "extensions/browser/extension_registry.h"
18 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
19 #include "extensions/common/manifest_handlers/background_info.h" 19 #include "extensions/common/manifest_handlers/background_info.h"
20 #include "extensions/common/permissions/api_permission_set.h" 20 #include "extensions/common/permissions/api_permission_set.h"
21 #include "extensions/common/permissions/permission_set.h" 21 #include "extensions/common/permissions/permission_set.h"
22 #include "extensions/common/permissions/permissions_data.h" 22 #include "extensions/common/permissions/permissions_data.h"
23 23
24 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
25 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 25 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
26 #include "chrome/browser/chromeos/login/users/user_manager.h"
27 #include "chromeos/dbus/dbus_thread_manager.h" 26 #include "chromeos/dbus/dbus_thread_manager.h"
28 #include "chromeos/dbus/session_manager_client.h" 27 #include "chromeos/dbus/session_manager_client.h"
29 #include "components/user_manager/user.h" 28 #include "components/user_manager/user.h"
29 #include "components/user_manager/user_manager.h"
30 #endif 30 #endif
31 31
32 namespace extensions { 32 namespace extensions {
33 namespace { 33 namespace {
34 34
35 base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) { 35 base::ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {
36 const PermissionsData* permissions_data = ext->permissions_data(); 36 const PermissionsData* permissions_data = ext->permissions_data();
37 const URLPatternSet& pattern_set = 37 const URLPatternSet& pattern_set =
38 effective_perm ? permissions_data->GetEffectiveHostPermissions() 38 effective_perm ? permissions_data->GetEffectiveHostPermissions()
39 : permissions_data->active_permissions()->explicit_hosts(); 39 : permissions_data->active_permissions()->explicit_hosts();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 if (!IsTestMode(GetProfile())) 89 if (!IsTestMode(GetProfile()))
90 chrome::AttemptExit(); 90 chrome::AttemptExit();
91 return true; 91 return true;
92 } 92 }
93 93
94 bool AutotestPrivateLoginStatusFunction::RunSync() { 94 bool AutotestPrivateLoginStatusFunction::RunSync() {
95 DVLOG(1) << "AutotestPrivateLoginStatusFunction"; 95 DVLOG(1) << "AutotestPrivateLoginStatusFunction";
96 96
97 base::DictionaryValue* result(new base::DictionaryValue); 97 base::DictionaryValue* result(new base::DictionaryValue);
98 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
99 const chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 99 const user_manager::UserManager* user_manager =
100 user_manager::UserManager::Get();
100 const bool is_screen_locked = 101 const bool is_screen_locked =
101 !!chromeos::ScreenLocker::default_screen_locker(); 102 !!chromeos::ScreenLocker::default_screen_locker();
102 103
103 if (user_manager) { 104 if (user_manager) {
104 result->SetBoolean("isLoggedIn", user_manager->IsUserLoggedIn()); 105 result->SetBoolean("isLoggedIn", user_manager->IsUserLoggedIn());
105 result->SetBoolean("isOwner", user_manager->IsCurrentUserOwner()); 106 result->SetBoolean("isOwner", user_manager->IsCurrentUserOwner());
106 result->SetBoolean("isScreenLocked", is_screen_locked); 107 result->SetBoolean("isScreenLocked", is_screen_locked);
107 if (user_manager->IsUserLoggedIn()) { 108 if (user_manager->IsUserLoggedIn()) {
108 result->SetBoolean("isRegularUser", 109 result->SetBoolean("isRegularUser",
109 user_manager->IsLoggedInAsRegularUser()); 110 user_manager->IsLoggedInAsRegularUser());
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 return new AutotestPrivateAPI(); 240 return new AutotestPrivateAPI();
240 } 241 }
241 242
242 AutotestPrivateAPI::AutotestPrivateAPI() : test_mode_(false) { 243 AutotestPrivateAPI::AutotestPrivateAPI() : test_mode_(false) {
243 } 244 }
244 245
245 AutotestPrivateAPI::~AutotestPrivateAPI() { 246 AutotestPrivateAPI::~AutotestPrivateAPI() {
246 } 247 }
247 248
248 } // namespace extensions 249 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698