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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ |
6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ | 6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <string> | 11 #include <string> |
11 | 12 |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "base/scoped_observer.h" | 14 #include "base/scoped_observer.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "chrome/browser/pepper_flash_settings_manager.h" | 16 #include "chrome/browser/pepper_flash_settings_manager.h" |
17 #include "chrome/browser/ui/webui/options/options_ui.h" | 17 #include "chrome/browser/ui/webui/options/options_ui.h" |
18 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" | 18 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" |
19 #include "components/content_settings/core/browser/content_settings_observer.h" | 19 #include "components/content_settings/core/browser/content_settings_observer.h" |
20 #include "components/content_settings/core/common/content_settings.h" | 20 #include "components/content_settings/core/common/content_settings.h" |
21 #include "components/content_settings/core/common/content_settings_types.h" | 21 #include "components/content_settings/core/common/content_settings_types.h" |
22 #include "components/prefs/pref_change_registrar.h" | 22 #include "components/prefs/pref_change_registrar.h" |
23 #include "content/public/browser/host_zoom_map.h" | 23 #include "content/public/browser/host_zoom_map.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 void UpdateFlashMediaLinksVisibility(ContentSettingsType type); | 266 void UpdateFlashMediaLinksVisibility(ContentSettingsType type); |
267 | 267 |
268 void UpdateMediaDeviceDropdownVisibility(ContentSettingsType type); | 268 void UpdateMediaDeviceDropdownVisibility(ContentSettingsType type); |
269 | 269 |
270 void UpdateProtectedContentExceptionsButton(); | 270 void UpdateProtectedContentExceptionsButton(); |
271 | 271 |
272 // Member variables --------------------------------------------------------- | 272 // Member variables --------------------------------------------------------- |
273 | 273 |
274 content::NotificationRegistrar notification_registrar_; | 274 content::NotificationRegistrar notification_registrar_; |
275 PrefChangeRegistrar pref_change_registrar_; | 275 PrefChangeRegistrar pref_change_registrar_; |
276 scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_; | 276 std::unique_ptr<PepperFlashSettingsManager> flash_settings_manager_; |
277 scoped_ptr<MediaSettingsInfo> media_settings_; | 277 std::unique_ptr<MediaSettingsInfo> media_settings_; |
278 scoped_ptr<content::HostZoomMap::Subscription> host_zoom_map_subscription_; | 278 std::unique_ptr<content::HostZoomMap::Subscription> |
279 scoped_ptr<content::HostZoomMap::Subscription> | 279 host_zoom_map_subscription_; |
| 280 std::unique_ptr<content::HostZoomMap::Subscription> |
280 signin_host_zoom_map_subscription_; | 281 signin_host_zoom_map_subscription_; |
281 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; | 282 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; |
282 | 283 |
283 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler); | 284 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler); |
284 }; | 285 }; |
285 | 286 |
286 } // namespace options | 287 } // namespace options |
287 | 288 |
288 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ | 289 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ |
OLD | NEW |