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

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

Issue 15892012: Identity API: defer loading component app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/component_loader.h" 5 #include "chrome/browser/extensions/component_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 base::FilePath(FILE_PATH_LITERAL("apps_debugger"))); 365 base::FilePath(FILE_PATH_LITERAL("apps_debugger")));
366 } 366 }
367 367
368 AddFileManagerExtension(); 368 AddFileManagerExtension();
369 AddImageLoaderExtension(); 369 AddImageLoaderExtension();
370 370
371 #if defined(ENABLE_SETTINGS_APP) 371 #if defined(ENABLE_SETTINGS_APP)
372 Add(IDR_SETTINGS_APP_MANIFEST, 372 Add(IDR_SETTINGS_APP_MANIFEST,
373 base::FilePath(FILE_PATH_LITERAL("settings_app"))); 373 base::FilePath(FILE_PATH_LITERAL("settings_app")));
374 #endif 374 #endif
375 Add(IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST,
376 base::FilePath(FILE_PATH_LITERAL("identity_scope_approval_dialog")));
377 } 375 }
378 376
379 #if defined(OS_CHROMEOS) 377 #if defined(OS_CHROMEOS)
380 if (!skip_session_components) { 378 if (!skip_session_components) {
381 Add(IDR_WALLPAPERMANAGER_MANIFEST, 379 Add(IDR_WALLPAPERMANAGER_MANIFEST,
382 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); 380 base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
383 381
384 #if defined(GOOGLE_CHROME_BUILD) 382 #if defined(GOOGLE_CHROME_BUILD)
385 if (!command_line->HasSwitch( 383 if (!command_line->HasSwitch(
386 chromeos::switches::kDisableQuickofficeComponentApp)) { 384 chromeos::switches::kDisableQuickofficeComponentApp)) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { 433 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
436 delete component->manifest; 434 delete component->manifest;
437 if (extension_service_->is_ready()) { 435 if (extension_service_->is_ready()) {
438 extension_service_-> 436 extension_service_->
439 UnloadExtension(component->extension_id, 437 UnloadExtension(component->extension_id,
440 extension_misc::UNLOAD_REASON_DISABLE); 438 extension_misc::UNLOAD_REASON_DISABLE);
441 } 439 }
442 } 440 }
443 441
444 } // namespace extensions 442 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698