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

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

Issue 650763003: Delay default apps installation on Chrome OS for first time sign-in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 Manifest::EXTERNAL_PREF_DOWNLOAD, 489 Manifest::EXTERNAL_PREF_DOWNLOAD,
490 bundled_extension_creation_flags))); 490 bundled_extension_creation_flags)));
491 } 491 }
492 #endif 492 #endif
493 493
494 #if defined(OS_CHROMEOS) 494 #if defined(OS_CHROMEOS)
495 if (!is_chromeos_demo_session && !is_chrome_os_public_session) { 495 if (!is_chromeos_demo_session && !is_chrome_os_public_session) {
496 int external_apps_path_id = profile->IsSupervised() ? 496 int external_apps_path_id = profile->IsSupervised() ?
497 chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS : 497 chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS :
498 chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS; 498 chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS;
499 ExternalPrefLoader::Options pref_load_flags = profile->IsNewProfile() ?
500 ExternalPrefLoader::DELAY_LOAD : ExternalPrefLoader::NONE;
asargent_no_longer_on_chrome 2014/10/23 22:34:35 A thought just occurred to me - is there a way to
Dmitry Polukhin 2014/10/24 11:40:42 Good idea, done.
499 provider_list->push_back( 501 provider_list->push_back(
500 linked_ptr<ExternalProviderInterface>(new ExternalProviderImpl( 502 linked_ptr<ExternalProviderInterface>(new ExternalProviderImpl(
501 service, 503 service,
502 new ExternalPrefLoader(external_apps_path_id, 504 new ExternalPrefLoader(external_apps_path_id,
503 ExternalPrefLoader::NONE), 505 pref_load_flags),
504 profile, 506 profile,
505 Manifest::EXTERNAL_PREF, 507 Manifest::EXTERNAL_PREF,
506 Manifest::EXTERNAL_PREF_DOWNLOAD, 508 Manifest::EXTERNAL_PREF_DOWNLOAD,
507 bundled_extension_creation_flags))); 509 bundled_extension_creation_flags)));
508 510
509 // OEM default apps. 511 // OEM default apps.
510 int oem_extension_creation_flags = 512 int oem_extension_creation_flags =
Nikita (slow) 2014/10/23 14:24:16 What about OEM default apps?
Dmitry Polukhin 2014/10/24 11:40:42 I don't postponed apps from sync installation so t
511 bundled_extension_creation_flags | Extension::WAS_INSTALLED_BY_OEM; 513 bundled_extension_creation_flags | Extension::WAS_INSTALLED_BY_OEM;
512 chromeos::ServicesCustomizationDocument* customization = 514 chromeos::ServicesCustomizationDocument* customization =
513 chromeos::ServicesCustomizationDocument::GetInstance(); 515 chromeos::ServicesCustomizationDocument::GetInstance();
514 provider_list->push_back(linked_ptr<ExternalProviderInterface>( 516 provider_list->push_back(linked_ptr<ExternalProviderInterface>(
515 new ExternalProviderImpl(service, 517 new ExternalProviderImpl(service,
516 customization->CreateExternalLoader(profile), 518 customization->CreateExternalLoader(profile),
517 profile, 519 profile,
518 Manifest::EXTERNAL_PREF, 520 Manifest::EXTERNAL_PREF,
519 Manifest::EXTERNAL_PREF_DOWNLOAD, 521 Manifest::EXTERNAL_PREF_DOWNLOAD,
520 oem_extension_creation_flags))); 522 oem_extension_creation_flags)));
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 service, 599 service,
598 new ExternalComponentLoader(profile), 600 new ExternalComponentLoader(profile),
599 profile, 601 profile,
600 Manifest::INVALID_LOCATION, 602 Manifest::INVALID_LOCATION,
601 Manifest::EXTERNAL_COMPONENT, 603 Manifest::EXTERNAL_COMPONENT,
602 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT))); 604 Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
603 } 605 }
604 } 606 }
605 607
606 } // namespace extensions 608 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698