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

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

Issue 55293006: Disable network speech on Chrome OS temporarily. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 CommandLine::ForCurrentProcess()->HasSwitch( 543 CommandLine::ForCurrentProcess()->HasSwitch(
544 switches::kDisableGoogleNowIntegration); 544 switches::kDisableGoogleNowIntegration);
545 545
546 if (enabled && !disabled_via_flag) { 546 if (enabled && !disabled_via_flag) {
547 Add(IDR_GOOGLE_NOW_MANIFEST, 547 Add(IDR_GOOGLE_NOW_MANIFEST,
548 base::FilePath(FILE_PATH_LITERAL("google_now"))); 548 base::FilePath(FILE_PATH_LITERAL("google_now")));
549 } 549 }
550 #endif 550 #endif
551 551
552 #if defined(GOOGLE_CHROME_BUILD) 552 #if defined(GOOGLE_CHROME_BUILD)
553 #if !defined(OS_CHROMEOS) // http://crbug.com/314799
553 AddNetworkSpeechSynthesisExtension(); 554 AddNetworkSpeechSynthesisExtension();
555 #endif
554 #endif // defined(GOOGLE_CHROME_BUILD) 556 #endif // defined(GOOGLE_CHROME_BUILD)
555 } 557 }
556 558
557 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { 559 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
558 delete component->manifest; 560 delete component->manifest;
559 if (extension_service_->is_ready()) { 561 if (extension_service_->is_ready()) {
560 extension_service_-> 562 extension_service_->
561 RemoveComponentExtension(component->extension_id); 563 RemoveComponentExtension(component->extension_id);
562 } 564 }
563 } 565 }
564 566
565 } // namespace extensions 567 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698