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

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

Issue 13495003: Add LoginState class to src/chromeos/login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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/extension_system.h" 5 #include "chrome/browser/extensions/extension_system.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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/common/chrome_version_info.h" 43 #include "chrome/common/chrome_version_info.h"
44 #include "chrome/common/extensions/extension.h" 44 #include "chrome/common/extensions/extension.h"
45 #include "chrome/common/extensions/features/feature.h" 45 #include "chrome/common/extensions/features/feature.h"
46 #include "chrome/common/extensions/manifest.h" 46 #include "chrome/common/extensions/manifest.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/url_data_source.h" 49 #include "content/public/browser/url_data_source.h"
50 50
51 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
52 #include "chrome/browser/app_mode/app_mode_utils.h" 52 #include "chrome/browser/app_mode/app_mode_utils.h"
53 #include "chrome/browser/chromeos/login/user_manager.h"
54 #include "chromeos/chromeos_switches.h" 53 #include "chromeos/chromeos_switches.h"
54 #include "chromeos/login/login_state.h"
55 #endif 55 #endif
56 56
57 using content::BrowserThread; 57 using content::BrowserThread;
58 58
59 namespace extensions { 59 namespace extensions {
60 60
61 // 61 //
62 // ExtensionSystem 62 // ExtensionSystem
63 // 63 //
64 64
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // These services must be registered before the ExtensionService tries to 157 // These services must be registered before the ExtensionService tries to
158 // load any extensions. 158 // load any extensions.
159 { 159 {
160 management_policy_.reset(new ManagementPolicy); 160 management_policy_.reset(new ManagementPolicy);
161 RegisterManagementPolicyProviders(); 161 RegisterManagementPolicyProviders();
162 } 162 }
163 163
164 bool skip_session_extensions = false; 164 bool skip_session_extensions = false;
165 #if defined(OS_CHROMEOS) 165 #if defined(OS_CHROMEOS)
166 // Skip loading session extensions if we are not in a user session. 166 // Skip loading session extensions if we are not in a user session.
167 skip_session_extensions = !chromeos::UserManager::Get()->IsUserLoggedIn(); 167 skip_session_extensions = !chromeos::LoginState::Get()->IsUserLoggedIn();
168 if (!chrome::IsRunningInForcedAppMode()) { 168 if (!chrome::IsRunningInForcedAppMode()) {
169 extension_service_->component_loader()->AddDefaultComponentExtensions( 169 extension_service_->component_loader()->AddDefaultComponentExtensions(
170 skip_session_extensions); 170 skip_session_extensions);
171 } 171 }
172 #else 172 #else
173 extension_service_->component_loader()->AddDefaultComponentExtensions( 173 extension_service_->component_loader()->AddDefaultComponentExtensions(
174 skip_session_extensions); 174 skip_session_extensions);
175 #endif 175 #endif
176 if (command_line->HasSwitch(switches::kLoadComponentExtension)) { 176 if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
177 CommandLine::StringType path_list = command_line->GetSwitchValueNative( 177 CommandLine::StringType path_list = command_line->GetSwitchValueNative(
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( 464 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
465 const std::string& extension_id, 465 const std::string& extension_id,
466 const extension_misc::UnloadedExtensionReason reason) { 466 const extension_misc::UnloadedExtensionReason reason) {
467 BrowserThread::PostTask( 467 BrowserThread::PostTask(
468 BrowserThread::IO, FROM_HERE, 468 BrowserThread::IO, FROM_HERE,
469 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(), 469 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(),
470 extension_id, reason)); 470 extension_id, reason));
471 } 471 }
472 472
473 } // namespace extensions 473 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/browser/google_apis/auth_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698