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

Side by Side Diff: chrome/browser/extensions/extension_system_impl.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test 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
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/extensions/extension_system_impl.h" 5 #include "chrome/browser/extensions/extension_system_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 profile_, 119 profile_,
120 profile_->GetPath().AppendASCII(extensions::kRulesStoreName), 120 profile_->GetPath().AppendASCII(extensions::kRulesStoreName),
121 false)); 121 false));
122 122
123 blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_))); 123 blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_)));
124 124
125 standard_management_policy_provider_.reset( 125 standard_management_policy_provider_.reset(
126 new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_))); 126 new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_)));
127 127
128 #if defined (OS_CHROMEOS) 128 #if defined (OS_CHROMEOS)
129 const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser(); 129 const chromeos::User* user = chromeos::GetUserManager()->GetActiveUser();
130 policy::DeviceLocalAccount::Type device_local_account_type; 130 policy::DeviceLocalAccount::Type device_local_account_type;
131 if (user && policy::IsDeviceLocalAccountUser(user->email(), 131 if (user && policy::IsDeviceLocalAccountUser(user->email(),
132 &device_local_account_type)) { 132 &device_local_account_type)) {
133 device_local_account_management_policy_provider_.reset( 133 device_local_account_management_policy_provider_.reset(
134 new chromeos::DeviceLocalAccountManagementPolicyProvider( 134 new chromeos::DeviceLocalAccountManagementPolicyProvider(
135 device_local_account_type)); 135 device_local_account_type));
136 } 136 }
137 #endif // defined (OS_CHROMEOS) 137 #endif // defined (OS_CHROMEOS)
138 138
139 #endif // defined(ENABLE_EXTENSIONS) 139 #endif // defined(ENABLE_EXTENSIONS)
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( 610 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
611 const std::string& extension_id, 611 const std::string& extension_id,
612 const UnloadedExtensionInfo::Reason reason) { 612 const UnloadedExtensionInfo::Reason reason) {
613 BrowserThread::PostTask( 613 BrowserThread::PostTask(
614 BrowserThread::IO, 614 BrowserThread::IO,
615 FROM_HERE, 615 FROM_HERE,
616 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason)); 616 base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason));
617 } 617 }
618 618
619 } // namespace extensions 619 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698