| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_API_
H_ | 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_API_
H_ |
| 6 #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_API_
H_ | 6 #define CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_API_
H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 TemplateURLService* url_service_; | 62 TemplateURLService* url_service_; |
| 63 | 63 |
| 64 // List of extensions waiting for the TemplateURLService to Load to | 64 // List of extensions waiting for the TemplateURLService to Load to |
| 65 // have search provider registered. | 65 // have search provider registered. |
| 66 PendingExtensions pending_extensions_; | 66 PendingExtensions pending_extensions_; |
| 67 | 67 |
| 68 // Listen to extension load, unloaded notifications. | 68 // Listen to extension load, unloaded notifications. |
| 69 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> | 69 ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> |
| 70 extension_registry_observer_; | 70 extension_registry_observer_; |
| 71 | 71 |
| 72 scoped_ptr<TemplateURLService::Subscription> template_url_sub_; | 72 std::unique_ptr<TemplateURLService::Subscription> template_url_sub_; |
| 73 | 73 |
| 74 DISALLOW_COPY_AND_ASSIGN(SettingsOverridesAPI); | 74 DISALLOW_COPY_AND_ASSIGN(SettingsOverridesAPI); |
| 75 }; | 75 }; |
| 76 | 76 |
| 77 template <> | 77 template <> |
| 78 void BrowserContextKeyedAPIFactory< | 78 void BrowserContextKeyedAPIFactory< |
| 79 SettingsOverridesAPI>::DeclareFactoryDependencies(); | 79 SettingsOverridesAPI>::DeclareFactoryDependencies(); |
| 80 | 80 |
| 81 } // namespace extensions | 81 } // namespace extensions |
| 82 | 82 |
| 83 #endif // CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_A
PI_H_ | 83 #endif // CHROME_BROWSER_EXTENSIONS_API_SETTINGS_OVERRIDES_SETTINGS_OVERRIDES_A
PI_H_ |
| OLD | NEW |