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

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

Issue 22001002: Use the connectivity diagnostics launcher so that it can open as an App (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix line length Created 7 years, 4 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 <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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 echo_extension_path = command_line->GetSwitchValuePath( 449 echo_extension_path = command_line->GetSwitchValuePath(
450 chromeos::switches::kEchoExtensionPath); 450 chromeos::switches::kEchoExtensionPath);
451 } 451 }
452 Add(IDR_ECHO_MANIFEST, echo_extension_path); 452 Add(IDR_ECHO_MANIFEST, echo_extension_path);
453 453
454 Add(IDR_NETWORK_CONFIGURATION_MANIFEST, 454 Add(IDR_NETWORK_CONFIGURATION_MANIFEST,
455 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); 455 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration")));
456 456
457 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST, 457 Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
458 base::FilePath(extension_misc::kConnectivityDiagnosticsPath)); 458 base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
459 Add(IDR_CONNECTIVITY_DIAGNOSTICS_LAUNCHER_MANIFEST,
460 base::FilePath(extension_misc::kConnectivityDiagnosticsLauncherPath));
459 } 461 }
460 462
461 // Load ChromeVox extension now if spoken feedback is enabled. 463 // Load ChromeVox extension now if spoken feedback is enabled.
462 if (chromeos::AccessibilityManager::Get() && 464 if (chromeos::AccessibilityManager::Get() &&
463 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) { 465 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) {
464 base::FilePath path = 466 base::FilePath path =
465 base::FilePath(extension_misc::kChromeVoxExtensionPath); 467 base::FilePath(extension_misc::kChromeVoxExtensionPath);
466 Add(IDR_CHROMEVOX_MANIFEST, path); 468 Add(IDR_CHROMEVOX_MANIFEST, path);
467 } 469 }
468 #endif // defined(OS_CHROMEOS) 470 #endif // defined(OS_CHROMEOS)
(...skipping 11 matching lines...) Expand all
480 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) { 482 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
481 delete component->manifest; 483 delete component->manifest;
482 if (extension_service_->is_ready()) { 484 if (extension_service_->is_ready()) {
483 extension_service_-> 485 extension_service_->
484 UnloadExtension(component->extension_id, 486 UnloadExtension(component->extension_id,
485 extension_misc::UNLOAD_REASON_DISABLE); 487 extension_misc::UNLOAD_REASON_DISABLE);
486 } 488 }
487 } 489 }
488 490
489 } // namespace extensions 491 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698