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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
548 Add(IDR_GOOGLE_NOW_MANIFEST, | 548 Add(IDR_GOOGLE_NOW_MANIFEST, |
549 base::FilePath(FILE_PATH_LITERAL("google_now"))); | 549 base::FilePath(FILE_PATH_LITERAL("google_now"))); |
550 } | 550 } |
551 #endif | 551 #endif |
552 | 552 |
553 #if defined(GOOGLE_CHROME_BUILD) | 553 #if defined(GOOGLE_CHROME_BUILD) |
554 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 | 554 #if !defined(OS_CHROMEOS) // http://crbug.com/314799 |
555 AddNetworkSpeechSynthesisExtension(); | 555 AddNetworkSpeechSynthesisExtension(); |
556 #endif | 556 #endif |
557 #endif // defined(GOOGLE_CHROME_BUILD) | 557 #endif // defined(GOOGLE_CHROME_BUILD) |
558 | |
559 base::FilePath pdf_path; | |
tapted
2013/12/02 04:17:19
does it need a #if defined(GOOGLE_CHROME_BUILD) gu
raymes
2013/12/04 04:54:49
This is the same check as in chrome_content_client
| |
560 PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path); | |
561 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kOutOfProcessPdf) && | |
562 base::PathExists(pdf_path)) { | |
tapted
2013/12/02 04:17:19
nit: I always indent these at 4 spaces. E.g. line
raymes
2013/12/04 04:54:49
Done.
| |
563 Add(IDR_PDF_MANIFEST, base::FilePath(FILE_PATH_LITERAL("pdf"))); | |
564 } | |
558 } | 565 } |
559 | 566 |
560 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { | 567 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { |
561 delete component->manifest; | 568 delete component->manifest; |
562 if (extension_service_->is_ready()) { | 569 if (extension_service_->is_ready()) { |
563 extension_service_-> | 570 extension_service_-> |
564 RemoveComponentExtension(component->extension_id); | 571 RemoveComponentExtension(component->extension_id); |
565 } | 572 } |
566 } | 573 } |
567 | 574 |
568 } // namespace extensions | 575 } // namespace extensions |
OLD | NEW |