OLD | NEW |
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 <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 Add(IDR_GOOGLE_NOW_MANIFEST, | 493 Add(IDR_GOOGLE_NOW_MANIFEST, |
494 base::FilePath(FILE_PATH_LITERAL("google_now"))); | 494 base::FilePath(FILE_PATH_LITERAL("google_now"))); |
495 } | 495 } |
496 #endif | 496 #endif |
497 } | 497 } |
498 | 498 |
499 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { | 499 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { |
500 delete component->manifest; | 500 delete component->manifest; |
501 if (extension_service_->is_ready()) { | 501 if (extension_service_->is_ready()) { |
502 extension_service_-> | 502 extension_service_-> |
503 UnloadExtension(component->extension_id, | 503 RemoveComponentExtension(component->extension_id); |
504 extension_misc::UNLOAD_REASON_UNINSTALL); | |
505 } | 504 } |
506 } | 505 } |
507 | 506 |
508 } // namespace extensions | 507 } // namespace extensions |
OLD | NEW |