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

Side by Side Diff: chrome/browser/extensions/external_provider_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 (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/external_provider_impl.h" 5 #include "chrome/browser/extensions/external_provider_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 #if defined(OS_MACOSX) 414 #if defined(OS_MACOSX)
415 check_admin_permissions_on_mac = 415 check_admin_permissions_on_mac =
416 ExternalPrefLoader::ENSURE_PATH_CONTROLLED_BY_ADMIN; 416 ExternalPrefLoader::ENSURE_PATH_CONTROLLED_BY_ADMIN;
417 #else 417 #else
418 check_admin_permissions_on_mac = ExternalPrefLoader::NONE; 418 check_admin_permissions_on_mac = ExternalPrefLoader::NONE;
419 #endif 419 #endif
420 420
421 bool is_chromeos_demo_session = false; 421 bool is_chromeos_demo_session = false;
422 int bundled_extension_creation_flags = Extension::NO_FLAGS; 422 int bundled_extension_creation_flags = Extension::NO_FLAGS;
423 #if defined(OS_CHROMEOS) 423 #if defined(OS_CHROMEOS)
424 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); 424 chromeos::UserManager* user_manager = chromeos::GetUserManager();
425 is_chromeos_demo_session = 425 is_chromeos_demo_session =
426 user_manager && user_manager->IsLoggedInAsDemoUser() && 426 user_manager && user_manager->IsLoggedInAsDemoUser() &&
427 connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK; 427 connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK;
428 bundled_extension_creation_flags = Extension::FROM_WEBSTORE | 428 bundled_extension_creation_flags = Extension::FROM_WEBSTORE |
429 Extension::WAS_INSTALLED_BY_DEFAULT; 429 Extension::WAS_INSTALLED_BY_DEFAULT;
430 #endif 430 #endif
431 431
432 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 432 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
433 if (!profile->IsSupervised()) { 433 if (!profile->IsSupervised()) {
434 provider_list->push_back( 434 provider_list->push_back(
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 service, 551 service,
552 new ExternalComponentLoader(profile), 552 new ExternalComponentLoader(profile),
553 profile, 553 profile,
554 Manifest::INVALID_LOCATION, 554 Manifest::INVALID_LOCATION,
555 Manifest::EXTERNAL_COMPONENT, 555 Manifest::EXTERNAL_COMPONENT,
556 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); 556 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
557 } 557 }
558 } 558 }
559 559
560 } // namespace extensions 560 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698