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/external_provider_impl.h" | 5 #include "chrome/browser/extensions/external_provider_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 20 matching lines...) Expand all Loading... | |
31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
33 | 33 |
34 #if defined(ENABLE_MANAGED_USERS) | 34 #if defined(ENABLE_MANAGED_USERS) |
35 #include "chrome/browser/managed_mode/managed_user_service.h" | 35 #include "chrome/browser/managed_mode/managed_user_service.h" |
36 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 36 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
37 #endif | 37 #endif |
38 | 38 |
39 #if defined(OS_CHROMEOS) | 39 #if defined(OS_CHROMEOS) |
40 #include "chrome/browser/chromeos/login/user_manager.h" | 40 #include "chrome/browser/chromeos/login/user_manager.h" |
41 #include "chrome/browser/policy/app_pack_updater.h" | 41 #include "chrome/browser/chromeos/policy/app_pack_updater.h" |
42 #include "chrome/browser/policy/browser_policy_connector.h" | 42 #include "chrome/browser/policy/browser_policy_connector.h" |
43 #endif | 43 #endif |
44 | 44 |
45 #if !defined(OS_CHROMEOS) | 45 #if !defined(OS_CHROMEOS) |
Joao da Silva
2013/03/13 15:54:44
If you care, change this to an #else :-)
Mattias Nissler (ping if slow)
2013/03/13 17:30:36
Done.
| |
46 #include "chrome/browser/extensions/default_apps.h" | 46 #include "chrome/browser/extensions/default_apps.h" |
47 #endif | 47 #endif |
48 | 48 |
49 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
50 #include "chrome/browser/extensions/external_registry_loader_win.h" | 50 #include "chrome/browser/extensions/external_registry_loader_win.h" |
51 #endif | 51 #endif |
52 | 52 |
53 using content::BrowserThread; | 53 using content::BrowserThread; |
54 | 54 |
55 namespace extensions { | 55 namespace extensions { |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
456 connector->GetAppPackUpdater()->CreateExternalLoader(), | 456 connector->GetAppPackUpdater()->CreateExternalLoader(), |
457 Manifest::EXTERNAL_PREF, | 457 Manifest::EXTERNAL_PREF, |
458 Manifest::INVALID_LOCATION, | 458 Manifest::INVALID_LOCATION, |
459 Extension::NO_FLAGS))); | 459 Extension::NO_FLAGS))); |
460 } | 460 } |
461 #endif | 461 #endif |
462 } | 462 } |
463 } | 463 } |
464 | 464 |
465 } // namespace extensions | 465 } // namespace extensions |
OLD | NEW |