| 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 "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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #if defined(USE_AURA) | 31 #if defined(USE_AURA) |
| 32 #include "grit/keyboard_resources.h" | 32 #include "grit/keyboard_resources.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 #if defined(OFFICIAL_BUILD) | 35 #if defined(OFFICIAL_BUILD) |
| 36 #include "chrome/browser/defaults.h" | 36 #include "chrome/browser/defaults.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #if defined(OS_CHROMEOS) | 39 #if defined(OS_CHROMEOS) |
| 40 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 40 #include "chrome/browser/chromeos/login/user_manager.h" | 41 #include "chrome/browser/chromeos/login/user_manager.h" |
| 41 #include "chromeos/chromeos_switches.h" | 42 #include "chromeos/chromeos_switches.h" |
| 42 #endif | 43 #endif |
| 43 | 44 |
| 44 #if defined(ENABLE_APP_LIST) | 45 #if defined(ENABLE_APP_LIST) |
| 45 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" |
| 46 #include "ui/base/l10n/l10n_util.h" | 47 #include "ui/base/l10n/l10n_util.h" |
| 47 #endif | 48 #endif |
| 48 | 49 |
| 49 namespace extensions { | 50 namespace extensions { |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 echo_extension_path = | 452 echo_extension_path = |
| 452 command_line->GetSwitchValuePath(switches::kEchoExtensionPath); | 453 command_line->GetSwitchValuePath(switches::kEchoExtensionPath); |
| 453 } | 454 } |
| 454 Add(IDR_ECHO_MANIFEST, echo_extension_path); | 455 Add(IDR_ECHO_MANIFEST, echo_extension_path); |
| 455 | 456 |
| 456 Add(IDR_NETWORK_CONFIGURATION_MANIFEST, | 457 Add(IDR_NETWORK_CONFIGURATION_MANIFEST, |
| 457 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); | 458 base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); |
| 458 } | 459 } |
| 459 | 460 |
| 460 // Load ChromeVox extension now if spoken feedback is enabled. | 461 // Load ChromeVox extension now if spoken feedback is enabled. |
| 461 if (local_state_->GetBoolean(prefs::kSpokenFeedbackEnabled)) { | 462 if (chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) { |
| 462 base::FilePath path = | 463 base::FilePath path = |
| 463 base::FilePath(extension_misc::kChromeVoxExtensionPath); | 464 base::FilePath(extension_misc::kChromeVoxExtensionPath); |
| 464 Add(IDR_CHROMEVOX_MANIFEST, path); | 465 Add(IDR_CHROMEVOX_MANIFEST, path); |
| 465 } | 466 } |
| 466 #endif // defined(OS_CHROMEOS) | 467 #endif // defined(OS_CHROMEOS) |
| 467 | 468 |
| 468 #if defined(ENABLE_GOOGLE_NOW) | 469 #if defined(ENABLE_GOOGLE_NOW) |
| 469 if (CommandLine::ForCurrentProcess()->HasSwitch( | 470 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 470 switches::kEnableGoogleNowIntegration)) { | 471 switches::kEnableGoogleNowIntegration)) { |
| 471 Add(IDR_GOOGLE_NOW_MANIFEST, | 472 Add(IDR_GOOGLE_NOW_MANIFEST, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 487 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { | 488 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 488 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, | 489 registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL, |
| 489 std::string() /* default_value */, | 490 std::string() /* default_value */, |
| 490 PrefRegistrySyncable::UNSYNCABLE_PREF); | 491 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 491 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, | 492 registry->RegisterStringPref(prefs::kEnterpriseWebStoreName, |
| 492 std::string() /* default_value */, | 493 std::string() /* default_value */, |
| 493 PrefRegistrySyncable::UNSYNCABLE_PREF); | 494 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 494 } | 495 } |
| 495 | 496 |
| 496 } // namespace extensions | 497 } // namespace extensions |
| OLD | NEW |