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

Side by Side Diff: chrome/browser/ui/webui/options/content_settings_handler.h

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 #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 <string> 10 #include <string>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/prefs/pref_change_registrar.h"
15 #include "base/scoped_observer.h" 14 #include "base/scoped_observer.h"
16 #include "base/values.h" 15 #include "base/values.h"
17 #include "chrome/browser/pepper_flash_settings_manager.h" 16 #include "chrome/browser/pepper_flash_settings_manager.h"
18 #include "chrome/browser/ui/webui/options/options_ui.h" 17 #include "chrome/browser/ui/webui/options/options_ui.h"
19 #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"
20 #include "components/content_settings/core/browser/content_settings_observer.h" 19 #include "components/content_settings/core/browser/content_settings_observer.h"
21 #include "components/content_settings/core/common/content_settings.h" 20 #include "components/content_settings/core/common/content_settings.h"
22 #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"
23 #include "content/public/browser/host_zoom_map.h" 23 #include "content/public/browser/host_zoom_map.h"
24 #include "content/public/browser/notification_observer.h" 24 #include "content/public/browser/notification_observer.h"
25 #include "content/public/browser/notification_registrar.h" 25 #include "content/public/browser/notification_registrar.h"
26 26
27 class HostContentSettingsMap; 27 class HostContentSettingsMap;
28 class ProtocolHandlerRegistry; 28 class ProtocolHandlerRegistry;
29 29
30 namespace options { 30 namespace options {
31 31
32 class ContentSettingsHandler : public OptionsPageUIHandler, 32 class ContentSettingsHandler : public OptionsPageUIHandler,
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 scoped_ptr<content::HostZoomMap::Subscription> 291 scoped_ptr<content::HostZoomMap::Subscription>
292 signin_host_zoom_map_subscription_; 292 signin_host_zoom_map_subscription_;
293 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 293 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
294 294
295 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler); 295 DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
296 }; 296 };
297 297
298 } // namespace options 298 } // namespace options
299 299
300 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_ 300 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698